June 2024 - U-Boot

Please pull u-boot-watchdog/master
by Stefan Roese 18 Jun '24

18 Jun '24

Hi Tom, please pull the following cyclic related change to fix the CI build issue here: ---------------------------------------------------------------- - cyclic: Rise default CYCLIC_MAX_CPU_TIME_US to 5000 (Jiaxun) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=371&view=results Thanks, Stefan The following changes since commit 16324b43db3f2b4fbbc3b701893fcfc4104f33fb: Merge tag 'u-boot-nand-20240617' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash (2024-06-17 09:27:28 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-watchdog.git for you to fetch changes up to 1fd754cebd38d7456caa82bef15225cbe77960ec: cyclic: Rise default CYCLIC_MAX_CPU_TIME_US to 5000 (2024-06-18 12:34:37 +0200) ---------------------------------------------------------------- Jiaxun Yang (1): cyclic: Rise default CYCLIC_MAX_CPU_TIME_US to 5000 common/Kconfig | 2 +- configs/octeon_nic23_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)

2 1

[PATCH v3] doc: describe UEFI measured boot
by Ilias Apalodimas 18 Jun '24

18 Jun '24

We currently only describe the process to enable measured boot using bootm. Describe the UEFI requirements as well which predate bootm. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes since v2: - add all bootX commands in the description instead of just bootm - Remove and extra _ from the header Changes since v1: - fixed remarks from Heinrich on titling and DTB measured PCR doc/usage/measured_boot.rst | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/doc/usage/measured_boot.rst b/doc/usage/measured_boot.rst index 9691904a9d8a..d31cb05226cd 100644 --- a/doc/usage/measured_boot.rst +++ b/doc/usage/measured_boot.rst @@ -7,19 +7,42 @@ U-Boot can perform a measured boot, the process of hashing various components of the boot process, extending the results in the TPM and logging the component's measurement in memory for the operating system to consume. +The functionality is available when booting via the EFI subsystem or 'bootm' +command. + +UEFI measured boot +------------------ +The EFI subsystem implements the `EFI TCG protocol +<https://trustedcomputinggroup.org/resource/tcg-efi-protocol-specification/>`_ +and the `TCG PC Client Specific Platform Firmware Profile Specification +<https://trustedcomputinggroup.org/resource/pc-client-specific-platform-firm…>`_ +which defines the binaries to be measured and the corresponding PCRs to be used. + +Requirements +~~~~~~~~~~~~ +* A hardware TPM 2.0 supported by an enabled U-Boot driver +* CONFIG_EFI_TCG2_PROTOCOL=y +* CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=y +* optional CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB=y will measure the loaded DTB in PCR 1 + +Measured legacy boot with bootX command +--------------------------------------- +The commands booti, bootm, and bootz can be used for measured boot +using the legacy entry point of the Linux kernel. + By default, U-Boot will measure the operating system (linux) image, the initrd image, and the "bootargs" environment variable. By enabling -CONFIG_MEASURE_DEVICETREE, U-Boot will also measure the devicetree image. +CONFIG_MEASURE_DEVICETREE, U-Boot will also measure the devicetree image in PCR1. The operating system typically would verify that the hashes found in the TPM PCRs match the contents of the event log. This can further be checked against the hash results of previous boots. Requirements ------------- +~~~~~~~~~~~~ -* A hardware TPM 2.0 supported by the U-Boot drivers -* CONFIG_TPM=y +* A hardware TPM 2.0 supported by an enabled U-Boot driver +* CONFIG_TPMv2=y * CONFIG_MEASURED_BOOT=y * Device-tree configuration of the TPM device to specify the memory area for event logging. The TPM device node must either contain a phandle to -- 2.45.2

2 2

[PATCH v4 0/2] introduce basic support for TI's am625-lp-sk
by Bryan Brattlof 18 Jun '24

18 Jun '24

Hello Again Everyone! The am625-lp-sk is a variant of the am625-sk showcasing the low-power features of the am625 SoC Family. Because it's essentially a board and package spin of the am625-sk I've inherited the am625 configuration and overridden what was needed. This is a new spin of Nitin's original work which has been updated significantly since October 2023 https://lore.kernel.org/u-boot/20231030110138.1347603-1-n-yadav@ti.com/ For those of us interested here is proof of life using buildroot: https://paste.sr.ht/~bryanb/40f7787f7760bee383aa8fbc342a29e8544dbdab This also works around a buildman issue not following #include directives. To get around this I've redefined the variables it's looking for inside the lp-sk defconfig to keep it happy for now. I made a pull request on github and everything seems like it's happy https://dev.azure.com/u-boot/u-boot/_build/results?buildId=8634&view=results Thank you for reviewing ~Bryan Cc: u-boot(a)lists.denx.de To: Tom Rini <trini(a)konsulko.com> Signed-off-by: Bryan Brattlof <bb(a)ti.com> Changes in v4: - change the defconfig name to match previous older versions - include needed CONFIG arguments for buildman - added a MAINTAINERS entry for the board - Link to v3: https://lore.kernel.org/r/20240429-am62q-wip-v3-0-17dcfdb1075a@ti.com Changes in v3: - actually update the copyright year - Link to v2: https://lore.kernel.org/r/20240429-am62q-wip-v2-0-e78f09174e65@ti.com Changes in v2: - updated copyright year - Link to v1: https://lore.kernel.org/r/20240429-am62q-wip-v1-0-927fd2e0a53b@ti.com --- Bryan Brattlof (1): configs: add defconfigs for the am625-lp-sk Nitin Yadav (1): arm: dts: add U-Boot dtbs for the am625-lp-sk arch/arm/dts/k3-am62-lp-sk-binman.dtsi | 21 + arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 17 + arch/arm/dts/k3-am62-lp4-50-800-800.dtsi | 2190 ++++++++++++++++++++++++++++++ arch/arm/dts/k3-am62-r5-lp-sk.dts | 82 ++ board/ti/am62x/MAINTAINERS | 4 +- configs/am62x_lpsk_a53_defconfig | 8 + configs/am62x_lpsk_r5_defconfig | 7 + 7 files changed, 2328 insertions(+), 1 deletion(-) --- base-commit: 227be29df37545f74243a98c12a4a33c4160e3cd change-id: 20240429-am62q-wip-f3453de038fb Best regards, -- Bryan Brattlof <bb(a)ti.com>

2 3

[PATCH 0/2] binman: am62a/62p: add support for signing TIFSStub
by Dhruva Gole 18 Jun '24

18 Jun '24

Add support for signing of TIFSSTUB images for HSSE, HSFS and GP devices and include them in tispl.bin and tispl.bin_unsigned in AM62A. AM62P doesn't have any GP support, hence not applicable. These changes are required for Low Power Mode features to work on these SoCs as this TIFS Stub gets used in the Low Power Exit sequences. Boot tested on both platforms that are being touched: [0] AM62A, [1] AM62P [0] https://gist.github.com/DhruvaG2000/d5f2a46818d8025a540efe9289feacb4 [1] https://gist.github.com/DhruvaG2000/ce29f6e9315a78d3e9e5810f55f17f43 Dhruva Gole (2): arm: dts: k3: binman: am62a: add support for signing TIFSStub Images arm: dts: k3: binman: am62p: add support for signing TIFSStub images arch/arm/dts/k3-am62a-sk-binman.dtsi | 138 ++++++++++++++++++++++++++- arch/arm/dts/k3-am62p-sk-binman.dtsi | 65 ++++++++++++- 2 files changed, 200 insertions(+), 3 deletions(-) base-commit: 1ebd659cf020843fd8e8ef90d85a66941cbab6ec -- 2.34.1

2 3

[PATCH v5] cmd: move ELF load and boot to lib/elf.c
by Maxim Moskalets 18 Jun '24

18 Jun '24

From: Maxim Moskalets <maximmosk4(a)gmail.com> Loading and running the ELF image is the responsibility of the library and should not be associated with the command line interface. It is also required to run ELF images from FIT with the bootm command so as not to depend on the command line interface. Signed-off-by: Maxim Moskalets <maximmosk4(a)gmail.com> --- cmd/elf.c | 58 +++++++++++++++++++-------------------------------- include/elf.h | 10 +++++++++ lib/elf.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 36 deletions(-) diff --git a/cmd/elf.c b/cmd/elf.c index a02361f9f5..32b7462f92 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -19,21 +19,6 @@ #include <linux/linkage.h> #endif -/* Allow ports to override the default behavior */ -static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]), - int argc, char *const argv[]) -{ - unsigned long ret; - - /* - * pass address parameter as argv[0] (aka command name), - * and all remaining args - */ - ret = entry(argc, argv); - - return ret; -} - /* Interpreter command to boot an arbitrary ELF image from memory */ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -43,8 +28,8 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) #endif unsigned long addr; /* Address of the ELF image */ unsigned long rc; /* Return value from user code */ - char *sload = NULL; - int rcode = 0; + int rcode = CMD_RET_SUCCESS; + Bootelf_flags flags = {0}; /* Consume 'bootelf' */ argc--; argv++; @@ -52,7 +37,10 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Check for [-p|-s] flag. */ if (argc >= 1 && (argv[0][0] == '-' && \ (argv[0][1] == 'p' || argv[0][1] == 's'))) { - sload = argv[0]; + if (argv[0][1] == 'p') + flags.phdr = 1; + log_debug("Using ELF header format %s\n", + flags.phdr ? "phdr" : "shdr"); /* Consume flag. */ argc--; argv++; } @@ -75,17 +63,9 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } else addr = image_load_addr; - if (!valid_elf_image(addr)) - return 1; - - if (sload && sload[1] == 'p') - addr = load_elf_image_phdr(addr); - else - addr = load_elf_image_shdr(addr); - #if CONFIG_IS_ENABLED(CMD_ELF_FDT_SETUP) if (fdt_addr) { - printf("## Setting up FDT at 0x%08lx ...\n", fdt_addr); + log_debug("Setting up FDT at 0x%08lx ...\n", fdt_addr); flush(); if (image_setup_libfdt(&img, (void *)fdt_addr, NULL)) @@ -93,21 +73,27 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } #endif - if (!env_get_autostart()) - return rcode; - - printf("## Starting application at 0x%08lx ...\n", addr); - flush(); + if (env_get_autostart()) { + flags.autostart = 1; + log_debug("Starting application at 0x%08lx ...\n", addr); + flush(); + } /* * pass address parameter as argv[0] (aka command name), - * and all remaining args + * and all remaining arguments */ - rc = do_bootelf_exec((void *)addr, argc, argv); + rc = bootelf(addr, flags, argc, argv); if (rc != 0) - rcode = 1; + rcode = CMD_RET_FAILURE; - printf("## Application terminated, rc = 0x%lx\n", rc); + if (flags.autostart) + { + if (ENOEXEC == errno) + log_err("Invalid ELF image\n"); + else + log_debug("## Application terminated, rc = 0x%lx\n", rc); + } return rcode; } diff --git a/include/elf.h b/include/elf.h index a4ba74d8ab..b88e6cf403 100644 --- a/include/elf.h +++ b/include/elf.h @@ -12,6 +12,12 @@ #ifndef __ASSEMBLY__ #include "compiler.h" +/* Flag param bits for bootelf() function */ +typedef struct { + unsigned phdr : 1; /* load via program (not section) headers */ + unsigned autostart : 1; /* Start ELF after loading */ +} Bootelf_flags; + /* This version doesn't work for 64-bit ABIs - Erik */ /* These typedefs need to be handled better */ @@ -700,6 +706,10 @@ unsigned long elf_hash(const unsigned char *name); #define R_RISCV_RELATIVE 3 #ifndef __ASSEMBLY__ +unsigned long bootelf_exec(ulong (*entry)(int, char * const[]), + int argc, char *const argv[]); +unsigned long bootelf(unsigned long addr, Bootelf_flags flags, + int argc, char *const argv[]); int valid_elf_image(unsigned long addr); unsigned long load_elf64_image_phdr(unsigned long addr); unsigned long load_elf64_image_shdr(unsigned long addr); diff --git a/lib/elf.c b/lib/elf.c index 9a794f9cba..dc13935e10 100644 --- a/lib/elf.c +++ b/lib/elf.c @@ -7,6 +7,7 @@ #include <cpu_func.h> #include <elf.h> #include <env.h> +#include <errno.h> #include <net.h> #include <vxworks.h> #ifdef CONFIG_X86 @@ -15,6 +16,59 @@ #include <linux/linkage.h> #endif +/** + * bootelf_exec() - start the ELF image execution. + * + * @entry: address of entry point of ELF. + * + * May by used to allow ports to override the default behavior. + */ +unsigned long bootelf_exec(ulong (*entry)(int, char * const[]), + int argc, char *const argv[]) +{ + return entry(argc, argv); +} + +/** + * bootelf() - Boot ELF from memory. + * + * @addr: Loading address of ELF in memory. + * @flags: Bits like ELF_PHDR to control boot details. + * @argc: May be used to pass command line arguments (maybe unused). + * Necessary for backward compatibility with the CLI command. + * If unused, must be 0. + * @argv: see @argc. If unused, must be NULL. + * Return: Number returned by ELF application. + * + * Sets errno = ENOEXEC if the ELF image is not valid. + */ +unsigned long bootelf(unsigned long addr, Bootelf_flags flags, + int argc, char *const argv[]) +{ + unsigned long entry_addr; + char *args[] = {"", NULL}; + + errno = 0; + + if (!valid_elf_image(addr)) { + errno = ENOEXEC; + return 1; + } + + entry_addr = flags.phdr ? load_elf_image_phdr(addr) + : load_elf_image_shdr(addr); + + if (!flags.autostart) + return 0; + + if (!argc && !argv) { + argc = 1; + argv = args; + } + + return bootelf_exec((void *)entry_addr, argc, argv); +} + /* * A very simple ELF64 loader, assumes the image is valid, returns the * entry point address. -- 2.39.2

4 4

[PATCH] fs/erofs: fix an overflow issue of unmapped extents
by Jianan Huang 18 Jun '24

18 Jun '24

Here the size should be `length - skip`, otherwise it could cause the destination buffer overflow. Reported-by: jianqiang wang <wjq.sec(a)gmail.com> Fixes: 65cb73057b65 ("fs/erofs: add lz4 decompression support") Signed-off-by: Jianan Huang <jnhuang95(a)gmail.com> --- fs/erofs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index f4b21d7917..95b609d8ea 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -313,7 +313,7 @@ static int z_erofs_read_data(struct erofs_inode *inode, char *buffer, } if (!(map.m_flags & EROFS_MAP_MAPPED)) { - memset(buffer + end - offset, 0, length); + memset(buffer + end - offset, 0, length - skip); end = map.m_la; continue; } -- 2.34.1

3 2

[PATCH v1] arm: dts: k3-am625-verdin: add combined binaries
by Andrejs Cainikovs 18 Jun '24

18 Jun '24

From: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> Add combined binaries for all Verdin AM62 variants. These binaries can be used to flash the U-Boot via single binary instead of few as it is done at the moment. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> --- .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index a9b86b61e53..0e6188907e4 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -448,4 +448,72 @@ }; }; +&binman { + firmware-verdin-am62-gp.bin { + filename = "firmware-verdin-am62-gp.bin"; + + blob-ext@1 { + filename = "tiboot3-am62x-gp-verdin.bin"; + }; + + blob-ext@2 { + filename = "tispl.bin_unsigned"; + /* + * This value matches CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR + * from R5 SPL config. + */ + offset = <0x80000>; + }; + + blob-ext@3 { + filename = "u-boot.img_unsigned"; + offset = <(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)>; + }; + }; + + firmware-verdin-am62-hs.bin { + filename = "firmware-verdin-am62-hs.bin"; + + blob-ext@1 { + filename = "tiboot3-am62x-hs-verdin.bin"; + }; + + blob-ext@2 { + filename = "tispl.bin"; + /* + * This value matches CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR + * from R5 SPL config. + */ + offset = <0x80000>; + }; + + blob-ext@3 { + filename = "u-boot.img"; + offset = <(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)>; + }; + }; + + firmware-verdin-am62-hs-fs.bin { + filename = "firmware-verdin-am62-hs-fs.bin"; + + blob-ext@1 { + filename = "tiboot3-am62x-hs-fs-verdin.bin"; + }; + + blob-ext@2 { + filename = "tispl.bin"; + /* + * This value matches CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR + * from R5 SPL config. + */ + offset = <0x80000>; + }; + + blob-ext@3 { + filename = "u-boot.img"; + offset = <(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)>; + }; + }; +}; + #endif /* CONFIG_TARGET_VERDIN_AM62_A53 */ -- 2.34.1

2 1

[PATCH 0/3] arm: dts: am625/am62a7: Switch over to OF_UPSTREAM
by Nishanth Menon 18 Jun '24

18 Jun '24

Cleanup am625 on by switching over the last two platforms (SK and beagleplay) over to OF_UPSTREAM, and while at it, switch over am62a7 (last of the am62* family) over as well. This superscedes the previous version of beagleplay only patch[1] Test logs: https://gist.github.com/nmenon/ba310d3750a80789aca6a4fd90190135 Nishanth Menon (3): arm: dts: am625_beagleplay: Switch to OF_UPSTREAM arm: dts: am625_sk: Switch to OF_UPSTREAM arm: dts: am62a7_sk: Switch to OF_UPSTREAM arch/arm/dts/Makefile | 7 +- arch/arm/dts/k3-am62-main.dtsi | 1058 ------------------ arch/arm/dts/k3-am62-mcu.dtsi | 176 --- arch/arm/dts/k3-am62-thermal.dtsi | 36 - arch/arm/dts/k3-am62-wakeup.dtsi | 96 -- arch/arm/dts/k3-am62.dtsi | 122 -- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 +- arch/arm/dts/k3-am625-beagleplay.dts | 932 --------------- arch/arm/dts/k3-am625-sk-binman.dtsi | 2 +- arch/arm/dts/k3-am625-sk.dts | 299 ----- arch/arm/dts/k3-am625.dtsi | 155 --- arch/arm/dts/k3-am62a-main.dtsi | 1054 ----------------- arch/arm/dts/k3-am62a-mcu.dtsi | 170 --- arch/arm/dts/k3-am62a-sk-binman.dtsi | 2 +- arch/arm/dts/k3-am62a-thermal.dtsi | 50 - arch/arm/dts/k3-am62a-wakeup.dtsi | 73 -- arch/arm/dts/k3-am62a.dtsi | 125 --- arch/arm/dts/k3-am62a7-sk.dts | 702 ------------ arch/arm/dts/k3-am62x-sk-common.dtsi | 535 --------- configs/am62ax_evm_a53_defconfig | 3 +- configs/am62x_beagleplay_a53_defconfig | 3 +- configs/am62x_evm_a53_defconfig | 3 +- 22 files changed, 12 insertions(+), 5595 deletions(-) delete mode 100644 arch/arm/dts/k3-am62-main.dtsi delete mode 100644 arch/arm/dts/k3-am62-mcu.dtsi delete mode 100644 arch/arm/dts/k3-am62-thermal.dtsi delete mode 100644 arch/arm/dts/k3-am62-wakeup.dtsi delete mode 100644 arch/arm/dts/k3-am62.dtsi delete mode 100644 arch/arm/dts/k3-am625-beagleplay.dts delete mode 100644 arch/arm/dts/k3-am625-sk.dts delete mode 100644 arch/arm/dts/k3-am625.dtsi delete mode 100644 arch/arm/dts/k3-am62a-main.dtsi delete mode 100644 arch/arm/dts/k3-am62a-mcu.dtsi delete mode 100644 arch/arm/dts/k3-am62a-thermal.dtsi delete mode 100644 arch/arm/dts/k3-am62a-wakeup.dtsi delete mode 100644 arch/arm/dts/k3-am62a.dtsi delete mode 100644 arch/arm/dts/k3-am62a7-sk.dts delete mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi [1] https://lore.kernel.org/u-boot/20240604134751.249048-1-nm@ti.com/ base-commit: 227be29df37545f74243a98c12a4a33c4160e3cd -- 2.43.0

5 8

[PATCH 1/3] efi_loader: select BLK not depends on BLK
by Tom Rini 18 Jun '24

18 Jun '24

The BLK symbol is used both for "we have a block device subsystem enabled" and "we need to utilize the block device library functions". In the case of efi_loader, it is the case of "we need to utilize the block device library", so select rather than depends on it. In turn, also disable EFI_LOADER on platforms which did not have it on previously due to a lack of block devices. They can enable it themselves if desired. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- configs/cortina_presidio-asic-base_defconfig | 1 + configs/cortina_presidio-asic-pnand_defconfig | 1 + configs/crs305-1g-4s-bit_defconfig | 1 + configs/crs305-1g-4s_defconfig | 1 + configs/crs326-24g-2s-bit_defconfig | 1 + configs/crs326-24g-2s_defconfig | 1 + configs/crs328-4c-20s-4s-bit_defconfig | 1 + configs/crs328-4c-20s-4s_defconfig | 1 + configs/gxp_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mt7981_rfb_defconfig | 1 + configs/mt7986_rfb_defconfig | 1 + configs/mx6memcal_defconfig | 1 + configs/pg_wcom_expu1_defconfig | 1 + configs/pg_wcom_expu1_update_defconfig | 1 + configs/pg_wcom_seli8_defconfig | 1 + configs/pg_wcom_seli8_update_defconfig | 1 + configs/r8a77970_eagle_defconfig | 1 + configs/smdkc100_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/stm32mp25_defconfig | 1 + configs/thunderx_88xx_defconfig | 1 + configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_ospi_defconfig | 1 + configs/xilinx_versal_mini_qspi_defconfig | 1 + configs/xilinx_versal_net_mini_defconfig | 1 + configs/xilinx_versal_net_mini_ospi_defconfig | 1 + configs/xilinx_versal_net_mini_qspi_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + lib/efi_loader/Kconfig | 2 +- 36 files changed, 36 insertions(+), 1 deletion(-) diff --git a/configs/cortina_presidio-asic-base_defconfig b/configs/cortina_presidio-asic-base_defconfig index 8f20f6515606..eb5743da64db 100644 --- a/configs/cortina_presidio-asic-base_defconfig +++ b/configs/cortina_presidio-asic-base_defconfig @@ -38,3 +38,4 @@ CONFIG_DM_SERIAL=y CONFIG_CORTINA_UART=y CONFIG_WDT=y CONFIG_WDT_CORTINA=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/cortina_presidio-asic-pnand_defconfig b/configs/cortina_presidio-asic-pnand_defconfig index 94dc3e1e2e8e..c7367d4d91cc 100644 --- a/configs/cortina_presidio-asic-pnand_defconfig +++ b/configs/cortina_presidio-asic-pnand_defconfig @@ -43,3 +43,4 @@ CONFIG_DM_SERIAL=y CONFIG_CORTINA_UART=y CONFIG_WDT=y CONFIG_WDT_CORTINA=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs305-1g-4s-bit_defconfig b/configs/crs305-1g-4s-bit_defconfig index a8f17570ecaa..c3d4594b75f7 100644 --- a/configs/crs305-1g-4s-bit_defconfig +++ b/configs/crs305-1g-4s-bit_defconfig @@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index c66d291eb926..1919e8c7794d 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -48,3 +48,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs326-24g-2s-bit_defconfig b/configs/crs326-24g-2s-bit_defconfig index b754dac45ec3..a584c26eb90f 100644 --- a/configs/crs326-24g-2s-bit_defconfig +++ b/configs/crs326-24g-2s-bit_defconfig @@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs326-24g-2s_defconfig b/configs/crs326-24g-2s_defconfig index 870127d38720..43f7455afbf6 100644 --- a/configs/crs326-24g-2s_defconfig +++ b/configs/crs326-24g-2s_defconfig @@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig index 2373775dc5a9..7bf671643a90 100644 --- a/configs/crs328-4c-20s-4s-bit_defconfig +++ b/configs/crs328-4c-20s-4s-bit_defconfig @@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig index 9bac12217a03..2f50bdaf1e7d 100644 --- a/configs/crs328-4c-20s-4s_defconfig +++ b/configs/crs328-4c-20s-4s_defconfig @@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/gxp_defconfig b/configs/gxp_defconfig index 00a9211fb052..d37749bd5e31 100644 --- a/configs/gxp_defconfig +++ b/configs/gxp_defconfig @@ -59,3 +59,4 @@ CONFIG_TIMER=y CONFIG_GXP_TIMER=y # CONFIG_RANDOM_UUID is not set CONFIG_SHA512=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 9906099e8c56..5424259ca445 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -62,3 +62,4 @@ CONFIG_SPL_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/mt7981_rfb_defconfig b/configs/mt7981_rfb_defconfig index 817e4b3e119d..3989c79d2b11 100644 --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig @@ -64,4 +64,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_HEXDUMP=y +# CONFIG_EFI_LOADER is not set CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7986_rfb_defconfig b/configs/mt7986_rfb_defconfig index 35227ebd3406..4d0cc85d0e57 100644 --- a/configs/mt7986_rfb_defconfig +++ b/configs/mt7986_rfb_defconfig @@ -64,4 +64,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_HEXDUMP=y +# CONFIG_EFI_LOADER is not set CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 7f11e6f5d451..4c8a5960d38a 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -44,3 +44,4 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_FSL_USDHC=y CONFIG_MXC_UART=y CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig index 2be9e242b589..61513c9e2ec9 100644 --- a/configs/pg_wcom_expu1_defconfig +++ b/configs/pg_wcom_expu1_defconfig @@ -104,5 +104,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_LZO=y +# CONFIG_EFI_LOADER is not set CONFIG_POST=y CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig index 9245a56adea0..ec0f975ae365 100644 --- a/configs/pg_wcom_expu1_update_defconfig +++ b/configs/pg_wcom_expu1_update_defconfig @@ -102,5 +102,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_LZO=y +# CONFIG_EFI_LOADER is not set CONFIG_POST=y CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig index 033dd82b28ec..82923d32ca69 100644 --- a/configs/pg_wcom_seli8_defconfig +++ b/configs/pg_wcom_seli8_defconfig @@ -104,5 +104,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_LZO=y +# CONFIG_EFI_LOADER is not set CONFIG_POST=y CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig index 4d34ef6d680e..41931e247688 100644 --- a/configs/pg_wcom_seli8_update_defconfig +++ b/configs/pg_wcom_seli8_update_defconfig @@ -102,5 +102,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_LZO=y +# CONFIG_EFI_LOADER is not set CONFIG_POST=y CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 09ea1c54f137..1dbbb2e26095 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -80,3 +80,4 @@ CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y CONFIG_TEE=y CONFIG_OPTEE=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index 54a037904594..256190ddabfc 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -39,3 +39,4 @@ CONFIG_ENV_IS_IN_ONENAND=y CONFIG_MTD=y CONFIG_SAMSUNG_ONENAND=y CONFIG_SMC911X=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index f0a364a562b8..0fff9080d417 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -68,3 +68,4 @@ CONFIG_SPI=y CONFIG_CADENCE_QSPI=y # CONFIG_SPL_WDT is not set CONFIG_SYS_TIMER_COUNTS_DOWN=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/stm32mp25_defconfig b/configs/stm32mp25_defconfig index 9fbd7eb15755..87038cc773ab 100644 --- a/configs/stm32mp25_defconfig +++ b/configs/stm32mp25_defconfig @@ -48,6 +48,7 @@ CONFIG_WDT=y CONFIG_WDT_STM32MP=y CONFIG_WDT_ARM_SMC=y CONFIG_ERRNO_STR=y +# CONFIG_EFI_LOADER is not set # CONFIG_LMB_USE_MAX_REGIONS is not set CONFIG_LMB_MEMORY_REGIONS=2 CONFIG_LMB_RESERVED_REGIONS=32 diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index 247e32d8e378..b754cc01cc81 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -36,3 +36,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_MMC is not set CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SKIP_INIT=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 9d3924cc9cbc..b97bf5e60a94 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -62,4 +62,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_MMC is not set CONFIG_ARM_DCC=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_versal_mini_ospi_defconfig b/configs/xilinx_versal_mini_ospi_defconfig index 7a110350c2cd..8f1625976032 100644 --- a/configs/xilinx_versal_mini_ospi_defconfig +++ b/configs/xilinx_versal_mini_ospi_defconfig @@ -72,4 +72,5 @@ CONFIG_CADENCE_QSPI=y CONFIG_HAS_CQSPI_REF_CLK=y CONFIG_CQSPI_REF_CLK=200000000 CONFIG_CADENCE_OSPI_VERSAL=y +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_versal_mini_qspi_defconfig b/configs/xilinx_versal_mini_qspi_defconfig index 58945a1cac9c..8fbde1c7d3ca 100644 --- a/configs/xilinx_versal_mini_qspi_defconfig +++ b/configs/xilinx_versal_mini_qspi_defconfig @@ -76,4 +76,5 @@ CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_ZYNQMP_GQSPI=y +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_versal_net_mini_defconfig b/configs/xilinx_versal_net_mini_defconfig index 7dac1ec54eb4..d6ebd0804637 100644 --- a/configs/xilinx_versal_net_mini_defconfig +++ b/configs/xilinx_versal_net_mini_defconfig @@ -71,4 +71,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ARM_DCC=y CONFIG_PL01X_SERIAL=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_versal_net_mini_ospi_defconfig b/configs/xilinx_versal_net_mini_ospi_defconfig index d78c9f805990..872a4a55952f 100644 --- a/configs/xilinx_versal_net_mini_ospi_defconfig +++ b/configs/xilinx_versal_net_mini_ospi_defconfig @@ -70,4 +70,5 @@ CONFIG_CADENCE_QSPI=y CONFIG_HAS_CQSPI_REF_CLK=y CONFIG_CQSPI_REF_CLK=200000000 CONFIG_CADENCE_OSPI_VERSAL=y +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_versal_net_mini_qspi_defconfig b/configs/xilinx_versal_net_mini_qspi_defconfig index b0567f857a3a..00319e061020 100644 --- a/configs/xilinx_versal_net_mini_qspi_defconfig +++ b/configs/xilinx_versal_net_mini_qspi_defconfig @@ -74,4 +74,5 @@ CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_ZYNQMP_GQSPI=y +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index 7fdd2eee5552..4b45074efc48 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -60,4 +60,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index d2e920fc5732..b4719536be16 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -60,4 +60,5 @@ CONFIG_SYS_NAND_MAX_CHIPS=2 CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 31f647357f75..7ede17654dd0 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -59,4 +59,5 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 957ae07b80ef..0d79ecece71a 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -92,4 +92,5 @@ CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y CONFIG_PANIC_HANG=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 48473d784439..750ea0db2b22 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -79,4 +79,5 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_ARM_DCC=y CONFIG_SYS_TIMER_COUNTS_DOWN=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 9f2b738d9d13..3155fe0b3783 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -83,4 +83,5 @@ CONFIG_SYS_FLASH_QUIET_TEST=y CONFIG_ARM_DCC=y CONFIG_SYS_TIMER_COUNTS_DOWN=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index 5b861bdde180..f2e1aa6d3abf 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -93,4 +93,5 @@ CONFIG_ARM_DCC=y CONFIG_ZYNQ_QSPI=y CONFIG_SYS_TIMER_COUNTS_DOWN=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set # CONFIG_LMB is not set diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 430bb7f0f7dc..ee71f417147a 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -10,9 +10,9 @@ config EFI_LOADER depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT - depends on BLK depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 + select BLK select CHARSET # We need to send DM events, dynamically, in the EFI block driver select DM_EVENT -- 2.34.1

2 4

[PATCH v3 0/9] binman: ti: create binman nodes for EFI capsules
by Jonathan Humphreys 18 Jun '24

18 Jun '24

Add binman nodes for EFI capsules of firmware components so that capsules are automatically created during the UBoot builds. This is enabled for several TI SoC based platforms: AM64, AM62, AM62p, BeaglePlay, AM69, J7, and BeagleboneAI. Changes from v1: - on GP devices, still use signed images in capsules where available - Insert board specific capsule GUIDs into the capsule node's image-guid. Changes from v2: - trigger building mkeficapsule tool on EFI_LOADER. This addresses buildman failures found with CI. - Added AM69 board support Link to v2: https://lore.kernel.org/r/20240419212819.170033-1-j-humphreys@ti.com Jonathan Humphreys (9): tools: Build mkeficapsule tool by default if EFI_LOADER is set dts: ti: binman: Add base K3 firmware capsule nodes dts: am64x: binman: Include firmware capsules binman nodes dts: j721e: binman: Include firmware capsules binman nodes dts: beagleplay: binman: Include firmware capsules binman nodes dts: am62px: binman: Include firmware capsules binman nodes dts: am62x: binman: Include firmware capsules binman nodes dts: beagleboneai64: binman: Include firmware capsules binman nodes dts: j784s4: binman: Include firmware capsules binman nodes arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 27 ++++++++++ arch/arm/dts/k3-am625-r5-beagleplay.dts | 15 ++++++ arch/arm/dts/k3-am625-sk-binman.dtsi | 30 ++++++++++++ arch/arm/dts/k3-am62p-sk-binman.dtsi | 29 +++++++++++ arch/arm/dts/k3-am64x-binman.dtsi | 30 ++++++++++++ arch/arm/dts/k3-binman-capsule-r5.dtsi | 21 ++++++++ arch/arm/dts/k3-binman-capsule.dtsi | 38 ++++++++++++++ .../dts/k3-j721e-beagleboneai64-u-boot.dtsi | 23 +++++++++ arch/arm/dts/k3-j721e-binman.dtsi | 49 +++++++++++++++++++ arch/arm/dts/k3-j721e-r5-beagleboneai64.dts | 29 +++++++++++ arch/arm/dts/k3-j784s4-binman.dtsi | 35 +++++++++++++ tools/Kconfig | 2 +- 12 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/k3-binman-capsule-r5.dtsi create mode 100644 arch/arm/dts/k3-binman-capsule.dtsi -- 2.34.1

2 10

[u-boot-test-hooks PATCH 0/4] QEMU Updates
by Jiaxun Yang 18 Jun '24

18 Jun '24

Hi all, This series updated u-boot-test-hooks to adopt QEMU 9.0. It also introduced 3 new boards: qemu-arm64be, qemu-xtensa-dc233c and qemu-loongarch64. This is required for CI changes. I'm going to respin other series later to utilise those new hooks. Thanks Jiaxun Yang (4): qemu-vexpress*: Pass -audio none qemu-arm64be: New board qemu-xtensa-dc233c: New board qemu-loongarch64: New board bin/travis-ci/conf.qemu-loongarch64_na | 12 ++++++++++++ bin/travis-ci/conf.qemu-xtensa-dc233c_na | 12 ++++++++++++ bin/travis-ci/conf.qemu_arm64be_na | 13 +++++++++++++ bin/travis-ci/conf.vexpress_ca15_tc2_qemu | 2 +- bin/travis-ci/conf.vexpress_ca9x4_qemu | 2 +- py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py | 10 ++++++++++ py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py | 11 +++++++++++ .../u_boot_boardenv_qemu_xtensa_dc233c_na.py | 6 ++++++ 8 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 bin/travis-ci/conf.qemu-loongarch64_na create mode 100644 bin/travis-ci/conf.qemu-xtensa-dc233c_na create mode 100644 bin/travis-ci/conf.qemu_arm64be_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py create mode 100644 py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py create mode 100644 py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py -- 2.43.0

3 13

[PATCH] amd: versal2: Use U_BOOT_LONGHELP macro
by Michal Simek 18 Jun '24

18 Jun '24

It is defined as __maybe_unused variable which fix issue when long help is disabled. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- board/amd/versal2/cmds.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board/amd/versal2/cmds.c b/board/amd/versal2/cmds.c index fbd99918a7f4..56ae39bc6a1e 100644 --- a/board/amd/versal2/cmds.c +++ b/board/amd/versal2/cmds.c @@ -71,10 +71,9 @@ static int do_versal2_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc, return cmd_process_error(cmdtp, ret); } -static char versal2_help_text[] = +U_BOOT_LONGHELP(versal2, "loadpdi addr len - Load pdi image\n" - "load pdi image at ddr address 'addr' with pdi image size 'len'\n" -; + "load pdi image at ddr address 'addr' with pdi image size 'len'\n"); U_BOOT_CMD_WITH_SUBCMDS(versal2, "Versal Gen 2 sub-system", versal2_help_text, U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1, -- 2.43.0

2 3

[PATCH 00/16] LoongArch initial support
by Jiaxun Yang 18 Jun '24

18 Jun '24

Hi all, Sorry for flooding the mailing list recently, yet another huge RFC series ahead. So after working on MIPS, arm64be and Xtensa I'm now on LoongArch, as suggested by Heinrich. So far this series has implemented general support for initializing CPU, exceptions, kernel booting, CPU and timer drivers, QEMU LoongArch virt machine support and UEFI standard compliant EFI booting support. LoongArch had defined 3 ISA variants, LA64, LA32 and LA32R (Reduced, intended for MCUs). Currently, only LA64 is implemented as 32bit support in open sourc world is not mature yet. However, most of the code is written with 32 bit support in mind, so it should be trivial to add 32 bit support in the future. It is a little endian only architecture. This series had passed checkpatch with exceptions on some false alarms and headers imported elsewhere. I had tested virtio devices, qfw direct kernel booting, efistub kernel booting and grub. Toolchain can be found at [1] or using upstream one, I had also discovered a couple of issues in kernel and QEMU in the porting process, patches at [2] and [3]. To build: ``` make qemu-loongarch64_defconfig make `` To run in QEMU (patched): ``` qemu-system-loongarch64 -nographic -machine virt -bios u-boot.bin ``` TODOs for me on this series: - Documents - I'll write board level document for QEMU, what should I write at architecture level? - MAINTAINERS entries - I'm not sure what I should add here, please suggest! - Further clean-ups TODOs on the architecture & board: - loongson,ls7a-rtc driver - The only device on QEMU board haven't been supported yet - LoongArch sandbox host support - Implement LoongArch's PE relocations - No application is using it so far, pe-format spec is not really clear. - TLB enablement - This is required for real CPU to utilize caches - Possibly EFI-APP support for real machine Porting to real SoCs is out of my scope as a hobbyist, I'll try to convince Loongson people or other hobbyists to work on that. I intended to use U-Boot as an OVMF replacement and second stage BL. Any comments are much appreciated! Thanks Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- Jiaxun Yang (16): lib: fdtdec: Handle multiple memory nodes linux/io.h: Use map_physmem to implement ioremap image: Take entry point as an output of setup_booti elf.h Define LoongArch bits image: Define IH_ARCH_LOONGARCH LoongArch: skeleton and headers LoongArch: lib: General routines LoongArch: CPU assembly routines LoongArch: Exception handling LoongArch: Boot Image bits LoongArch: Generic CPU type cpu: Add loongarch_cpu driver timer: Add loongarch_timer driver board: emulation: Add qemu-loongarch efi: LoongArch: Define LoongArch bits everywhere efi: LoongArch: Implement everything arch/Kconfig | 15 + arch/arm/lib/image.c | 3 +- arch/loongarch/Kconfig | 49 + arch/loongarch/Makefile | 19 + arch/loongarch/config.mk | 27 + arch/loongarch/cpu/Makefile | 9 + arch/loongarch/cpu/cpu.c | 28 + arch/loongarch/cpu/generic/Kconfig | 13 + arch/loongarch/cpu/generic/Makefile | 7 + arch/loongarch/cpu/generic/cpu.c | 22 + arch/loongarch/cpu/generic/dram.c | 21 + arch/loongarch/cpu/genex.S | 21 + arch/loongarch/cpu/smp_secondary.S | 55 + arch/loongarch/cpu/start.S | 169 +++ arch/loongarch/cpu/u-boot.lds | 85 ++ arch/loongarch/dts/Makefile | 13 + arch/loongarch/dts/qemu-loongarch64.dts | 9 + arch/loongarch/include/asm/acpi_table.h | 8 + arch/loongarch/include/asm/addrspace.h | 87 ++ .../include/asm/arch-generic/entry-init.h | 15 + arch/loongarch/include/asm/asm.h | 186 +++ arch/loongarch/include/asm/atomic.h | 12 + arch/loongarch/include/asm/barrier.h | 138 ++ arch/loongarch/include/asm/bitops.h | 156 +++ arch/loongarch/include/asm/byteorder.h | 22 + arch/loongarch/include/asm/cache.h | 24 + arch/loongarch/include/asm/config.h | 11 + arch/loongarch/include/asm/cpu.h | 123 ++ arch/loongarch/include/asm/dma-mapping.h | 27 + arch/loongarch/include/asm/global_data.h | 43 + arch/loongarch/include/asm/gpio.h | 11 + arch/loongarch/include/asm/io.h | 399 ++++++ arch/loongarch/include/asm/linkage.h | 11 + arch/loongarch/include/asm/loongarch.h | 1468 ++++++++++++++++++++ arch/loongarch/include/asm/posix_types.h | 87 ++ arch/loongarch/include/asm/processor.h | 11 + arch/loongarch/include/asm/ptrace.h | 33 + arch/loongarch/include/asm/regdef.h | 42 + arch/loongarch/include/asm/sections.h | 8 + arch/loongarch/include/asm/setjmp.h | 25 + arch/loongarch/include/asm/spl.h | 11 + arch/loongarch/include/asm/stackframe.h | 175 +++ arch/loongarch/include/asm/string.h | 11 + arch/loongarch/include/asm/system.h | 74 + arch/loongarch/include/asm/types.h | 37 + arch/loongarch/include/asm/u-boot-loongarch.h | 23 + arch/loongarch/include/asm/u-boot.h | 30 + arch/loongarch/include/asm/unaligned.h | 11 + arch/loongarch/lib/Makefile | 26 + arch/loongarch/lib/asm-offsets.c | 66 + arch/loongarch/lib/boot.c | 14 + arch/loongarch/lib/bootm.c | 177 +++ arch/loongarch/lib/cache.c | 73 + arch/loongarch/lib/crt0_loongarch_efi.S | 182 +++ arch/loongarch/lib/elf_loongarch_efi.lds | 76 + arch/loongarch/lib/image.c | 66 + arch/loongarch/lib/interrupts.c | 189 +++ arch/loongarch/lib/reloc_loongarch_efi.c | 107 ++ arch/loongarch/lib/reset.c | 14 + arch/loongarch/lib/setjmp.S | 52 + arch/riscv/lib/image.c | 4 +- arch/sandbox/lib/bootm.c | 2 +- board/emulation/qemu-loongarch/Kconfig | 68 + board/emulation/qemu-loongarch/MAINTAINERS | 7 + board/emulation/qemu-loongarch/Makefile | 6 + board/emulation/qemu-loongarch/qemu-loongarch.c | 84 ++ board/emulation/qemu-loongarch/qemu-loongarch.env | 6 + boot/bootm.c | 5 +- boot/bootmeth_efi.c | 2 + boot/image.c | 1 + cmd/Kconfig | 2 +- cmd/booti.c | 5 +- common/spl/spl.c | 9 +- configs/qemu-loongarch64_defconfig | 36 + drivers/cpu/Kconfig | 6 + drivers/cpu/Makefile | 1 + drivers/cpu/loongarch_cpu.c | 148 ++ drivers/timer/Kconfig | 8 + drivers/timer/Makefile | 1 + drivers/timer/loongarch_timer.c | 112 ++ include/asm-generic/pe.h | 2 + include/config_distro_bootcmd.h | 5 + include/configs/qemu-loongarch.h | 13 + include/efi_default_filename.h | 2 + include/elf.h | 9 +- include/image.h | 4 +- include/linux/io.h | 3 +- lib/efi_loader/Kconfig | 2 +- lib/efi_loader/efi_image_loader.c | 7 + lib/efi_loader/efi_runtime.c | 4 + lib/efi_selftest/efi_selftest_miniapp_exception.c | 2 + lib/fdtdec.c | 137 +- 92 files changed, 5559 insertions(+), 70 deletions(-) --- base-commit: a7f0154c412859323396111dd0c09dbafbc153cb change-id: 20240522-loongarch-8a04c1e34a47 Best regards, -- Jiaxun Yang <jiaxun.yang(a)flygoat.com>

5 42

[PATCH 1/1] cmd: link to doc/usage/fit/x86-fit-boot.rst
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

Replace the outdated link. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index ff0f5941ecc..9e4245a9702 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -622,7 +622,7 @@ config CMD_ZBOOT Consider using FIT in preference to this since it supports directly booting both 32- and 64-bit kernels, as well as secure boot. - Documentation is available in doc/uImage.FIT/x86-fit-boot.txt + Documentation is available in doc/usage/fit/x86-fit-boot.rst. endmenu -- 2.43.0

2 1

[PATCH 1/1] spl: correct link to FIT specification
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

Replace the invalid link to the FIT file format specification. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- SPL is tightly size constrained. Shouldn't we remove the message with the link which is only of interest to developers. --- common/spl/spl_fit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 988125be008..2a097f4464c 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -587,7 +587,7 @@ __weak void *spl_load_simple_fit_fix_load(const void *fit) static void warn_deprecated(const char *msg) { printf("DEPRECATED: %s\n", msg); - printf("\tSee doc/uImage.FIT/source_file_format.txt\n"); + printf("\tSee https://fitspec.osfw.foundation/\n"); } static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node, -- 2.43.0

3 3

[PATCH 1/1] cmd: correct kaslrseed description
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

The number of random bytes generated is hard coded as 8. The command takes no argument. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/kaslrseed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kaslrseed.c b/cmd/kaslrseed.c index e0d3c7fe748..e9b0e3d5985 100644 --- a/cmd/kaslrseed.c +++ b/cmd/kaslrseed.c @@ -68,7 +68,7 @@ static int do_kaslr_seed(struct cmd_tbl *cmdtp, int flag, int argc, char *const } U_BOOT_LONGHELP(kaslrseed, - "[n]\n" + "\n" " - append random bytes to chosen kaslr-seed node\n"); U_BOOT_CMD( -- 2.45.1

1 0

[PATCH v1 0/1] video: tegra: dc: improve DC id detection
by Svyatoslav Ryhel 18 Jun '24

18 Jun '24

Use dedicated property to detect DC rather then use device name. Svyatoslav Ryhel (1): video: tegra20: dc: use nvidia,head property to identify DC controller drivers/video/tegra20/tegra-dc.c | 6 ++---- drivers/video/tegra20/tegra-dc.h | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) -- 2.43.0

2 2

[PATCH v2 1/1] usb: informative message if no controller
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

The message 'No working controllers found' provides no clue that this refers to USB controllers. Provide a message that refers to USB. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: add 'found' at end of message keep printf --- drivers/usb/host/usb-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d66..bd861270af3 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -388,7 +388,7 @@ int usb_init(void) /* if we were not able to find at least one working bus, bail out */ if (controllers_initialized == 0) - printf("No working controllers found\n"); + printf("No USB controller found\n"); return usb_started ? 0 : -ENOENT; } -- 2.43.0

3 2

[PATCH v2 0/4] Initial support for new Tegra 2/3 devices
by Svyatoslav Ryhel 18 Jun '24

18 Jun '24

Patchset includes initial support bringup for 4 new Tegra 2 and Tegra 3 devices which include Asus Transformers with Tegra 2, Microfost Surface RT, Lenovo Ideapad Yoga 11 and Wexler Tab 7t. All setups are tested on real hardware and pass buildman and CI. --- Changes from v1: - removed <linux/sizes.h> inclusion --- Jonas Schwöbel (2): board: microsoft: surface-rt: add Microsoft Surface RT support board: lenovo: ideapad-yoga-11: Lenovo Ideapad Yoga 11 Svyatoslav Ryhel (2): board: asus: transformer: add ASUS Transformer T20 family support board: wexler: qc750: add WEXLER Tab 7t support arch/arm/dts/Makefile | 9 +- arch/arm/dts/tegra20-asus-sl101.dts | 9 + arch/arm/dts/tegra20-asus-tf101.dts | 9 + arch/arm/dts/tegra20-asus-tf101g.dts | 9 + arch/arm/dts/tegra20-asus-transformer.dtsi | 545 +++++++ .../dts/tegra30-lenovo-ideapad-yoga-11.dts | 1266 +++++++++++++++++ arch/arm/dts/tegra30-microsoft-surface-rt.dts | 1083 ++++++++++++++ arch/arm/dts/tegra30-wexler-qc750.dts | 1106 ++++++++++++++ arch/arm/mach-tegra/tegra20/Kconfig | 5 + arch/arm/mach-tegra/tegra30/Kconfig | 15 + board/asus/transformer-t20/Kconfig | 12 + board/asus/transformer-t20/MAINTAINERS | 8 + board/asus/transformer-t20/Makefile | 9 + .../asus/transformer-t20/configs/sl101.config | 1 + .../asus/transformer-t20/configs/tf101.config | 1 + .../transformer-t20/configs/tf101g.config | 1 + board/asus/transformer-t20/transformer-t20.c | 57 + board/lenovo/ideapad-yoga-11/Kconfig | 12 + board/lenovo/ideapad-yoga-11/MAINTAINERS | 7 + board/lenovo/ideapad-yoga-11/Makefile | 6 + .../ideapad-yoga-11/ideapad-yoga-11-spl.c | 41 + board/microsoft/surface-rt/Kconfig | 12 + board/microsoft/surface-rt/MAINTAINERS | 7 + board/microsoft/surface-rt/Makefile | 6 + board/microsoft/surface-rt/surface-rt-spl.c | 41 + board/wexler/qc750/Kconfig | 12 + board/wexler/qc750/MAINTAINERS | 7 + board/wexler/qc750/Makefile | 11 + board/wexler/qc750/qc750-spl.c | 45 + board/wexler/qc750/qc750.c | 21 + configs/ideapad-yoga-11_defconfig | 84 ++ configs/qc750_defconfig | 81 ++ configs/surface-rt_defconfig | 80 ++ configs/transformer_t20_defconfig | 82 ++ doc/board/asus/index.rst | 1 + doc/board/asus/transformer_t20.rst | 129 ++ doc/board/index.rst | 3 + doc/board/lenovo/ideapad-yoga-11.rst | 41 + doc/board/lenovo/index.rst | 9 + doc/board/microsoft/index.rst | 9 + doc/board/microsoft/surface-rt.rst | 41 + doc/board/wexler/index.rst | 9 + doc/board/wexler/qc750.rst | 125 ++ include/configs/ideapad-yoga-11.h | 77 + include/configs/qc750.h | 65 + include/configs/surface-rt.h | 39 + include/configs/transformer-t20.h | 21 + 47 files changed, 5268 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/tegra20-asus-sl101.dts create mode 100644 arch/arm/dts/tegra20-asus-tf101.dts create mode 100644 arch/arm/dts/tegra20-asus-tf101g.dts create mode 100644 arch/arm/dts/tegra20-asus-transformer.dtsi create mode 100644 arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts create mode 100644 arch/arm/dts/tegra30-microsoft-surface-rt.dts create mode 100644 arch/arm/dts/tegra30-wexler-qc750.dts create mode 100644 board/asus/transformer-t20/Kconfig create mode 100644 board/asus/transformer-t20/MAINTAINERS create mode 100644 board/asus/transformer-t20/Makefile create mode 100644 board/asus/transformer-t20/configs/sl101.config create mode 100644 board/asus/transformer-t20/configs/tf101.config create mode 100644 board/asus/transformer-t20/configs/tf101g.config create mode 100644 board/asus/transformer-t20/transformer-t20.c create mode 100644 board/lenovo/ideapad-yoga-11/Kconfig create mode 100644 board/lenovo/ideapad-yoga-11/MAINTAINERS create mode 100644 board/lenovo/ideapad-yoga-11/Makefile create mode 100644 board/lenovo/ideapad-yoga-11/ideapad-yoga-11-spl.c create mode 100644 board/microsoft/surface-rt/Kconfig create mode 100644 board/microsoft/surface-rt/MAINTAINERS create mode 100644 board/microsoft/surface-rt/Makefile create mode 100644 board/microsoft/surface-rt/surface-rt-spl.c create mode 100644 board/wexler/qc750/Kconfig create mode 100644 board/wexler/qc750/MAINTAINERS create mode 100644 board/wexler/qc750/Makefile create mode 100644 board/wexler/qc750/qc750-spl.c create mode 100644 board/wexler/qc750/qc750.c create mode 100644 configs/ideapad-yoga-11_defconfig create mode 100644 configs/qc750_defconfig create mode 100644 configs/surface-rt_defconfig create mode 100644 configs/transformer_t20_defconfig create mode 100644 doc/board/asus/transformer_t20.rst create mode 100644 doc/board/lenovo/ideapad-yoga-11.rst create mode 100644 doc/board/lenovo/index.rst create mode 100644 doc/board/microsoft/index.rst create mode 100644 doc/board/microsoft/surface-rt.rst create mode 100644 doc/board/wexler/index.rst create mode 100644 doc/board/wexler/qc750.rst create mode 100644 include/configs/ideapad-yoga-11.h create mode 100644 include/configs/qc750.h create mode 100644 include/configs/surface-rt.h create mode 100644 include/configs/transformer-t20.h -- 2.43.0

1 4

[PATCH next] power: rk8xx: fix display name for RK808
by Quentin Schulz 18 Jun '24

18 Jun '24

From: Quentin Schulz <quentin.schulz(a)cherry.de> Commit 2ce40542e0eb ("power: rk8xx: properly print all supported PMICs name") fixed all PMICs name that were broken but broke the only one that was not broken already: RK808. This one is a special case because the ID registers are marked as reserved and always return 0, so the variant cannot be derived the same way it is done for other PMICs from Rockchip. Fixes: 2ce40542e0eb ("power: rk8xx: properly print all supported PMICs name") Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- Tested on RK3399 Puma. --- drivers/power/pmic/rk8xx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 617bb511e4e..4d5a5ceafad 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -281,6 +281,8 @@ static int rk8xx_probe(struct udevice *dev) show_variant = bitfield_extract_by_mask(priv->variant, RK8XX_ID_MSK); switch (priv->variant) { case RK808_ID: + /* RK808 ID is 0x0000, so fix show_variant for that PMIC */ + show_variant = 0x808; break; case RK805_ID: case RK816_ID: --- base-commit: e242cd95130b64cf91692da41363ac59b25fc08d change-id: 20240617-rk808-show-variant-2121df41caf7 Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 3

[PATCH 1/3] configs: rockchip: cosmetic changes for rk3308, rk3328, rk3399, rk3568, and rk3588
by FUKAUMI Naoki 18 Jun '24

18 Jun '24

no functional change is intended. Signed-off-by: FUKAUMI Naoki <naoki(a)radxa.com> --- include/configs/rk3308_common.h | 26 ++++++++++----------- include/configs/rk3328_common.h | 28 +++++++++++------------ include/configs/rk3399_common.h | 40 ++++++++++++++++----------------- include/configs/rk3568_common.h | 14 ++++++------ include/configs/rk3588_common.h | 12 +++++----- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 861154fbeb..80113220e4 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -8,24 +8,24 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xfff80000 +#define CFG_IRAM_BASE 0xfff80000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00500000\0" \ - "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x03e00000\0" \ - "fdtoverlay_addr_r=0x03f00000\0" \ - "kernel_addr_r=0x00680000\0" \ +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\0" \ + "pxefile_addr_r=0x00600000\0" \ + "fdt_addr_r=0x03e00000\0" \ + "fdtoverlay_addr_r=0x03f00000\0" \ + "kernel_addr_r=0x00680000\0" \ "ramdisk_addr_r=0x04000000\0" -#define CFG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - ENV_MEM_LAYOUT_SETTINGS \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3308_COMMON_H */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 2c40674b22..f9e6634c5f 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -8,25 +8,25 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xff090000 +#define CFG_IRAM_BASE 0xff090000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00500000\0" \ - "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x01f00000\0" \ - "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" \ - "kernel_comp_addr_r=0x08000000\0" \ +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\0" \ + "pxefile_addr_r=0x00600000\0" \ + "fdt_addr_r=0x01f00000\0" \ + "kernel_addr_r=0x02080000\0" \ + "ramdisk_addr_r=0x06000000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ "kernel_comp_size=0x2000000\0" -#define CFG_EXTRA_ENV_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3328_COMMON_H */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 4e75771055..62007c8b27 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -8,36 +8,36 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 #ifndef CONFIG_SPL_BUILD -#define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00500000\0" \ - "script_offset_f=0xffe000\0" \ - "script_size_f=0x2000\0" \ - "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x01f00000\0" \ - "fdtoverlay_addr_r=0x02000000\0" \ - "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" \ - "kernel_comp_addr_r=0x08000000\0" \ - "kernel_comp_size=0x2000000\0" - #ifndef ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS #endif -#define CFG_EXTRA_ENV_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\0" \ + "script_offset_f=0xffe000\0" \ + "script_size_f=0x2000\0" \ + "pxefile_addr_r=0x00600000\0" \ + "fdt_addr_r=0x01f00000\0" \ + "fdtoverlay_addr_r=0x02000000\0" \ + "kernel_addr_r=0x02080000\0" \ + "ramdisk_addr_r=0x06000000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" + +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* CONFIG_SPL_BUILD */ -#endif +#endif /* __CONFIG_RK3399_COMMON_H */ diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 48f93083de..09b7b71c6a 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ @@ -10,7 +10,7 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xfdcc0000 +#define CFG_IRAM_BASE 0xfdcc0000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf0000000 @@ -28,10 +28,10 @@ "kernel_comp_size=0x8000000\0" #define CFG_EXTRA_ENV_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3568_COMMON_H */ diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h index 70430612ef..e6654c275a 100644 --- a/include/configs/rk3588_common.h +++ b/include/configs/rk3588_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. @@ -26,11 +26,11 @@ "ramdisk_addr_r=0x12180000\0" \ "kernel_comp_size=0x8000000\0" -#define CFG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ENV_MEM_LAYOUT_SETTINGS \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" #endif /* __CONFIG_RK3588_COMMON_H */ -- 2.43.0

2 4

[PATCH 1/1] doc: FIT links in develop/uefi/uefi.rst
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

Correct the links to the FIT documentation. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/develop/uefi/uefi.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index 0389b269c01..ea70dcbda86 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -72,7 +72,7 @@ bootm command. This feature is available if U-Boot is configured with:: CONFIG_BOOTM_EFI=y -A sample configuration is provided as file doc/uImage.FIT/uefi.its. +A sample configuration is provided in :doc:`../../usage/fit/uefi`. Below you find the output of an example session starting GRUB:: @@ -96,7 +96,7 @@ Below you find the output of an example session starting GRUB:: ## Transferring control to EFI (at address 404000d0) ... Welcome to GRUB! -See doc/uImage.FIT/howto.txt for an introduction to FIT images. +See :doc:`../../usage/fit/howto` for an introduction to FIT images. Configuring UEFI secure boot ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- 2.43.0

2 1

[PATCH] boot: links to FIT documentation in Kconfig
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

Correct the links to the FIT documentation in boot/Kconfig. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- boot/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 6f3096c15a6..36bdc83b957 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -85,7 +85,7 @@ config FIT_SIGNATURE using a hash signed and verified using RSA. If CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive hashing is available using hardware, then the RSA library will use - it. See doc/uImage.FIT/signature.txt for more details. + it. See doc/usage/fit/signature.rst for more details. WARNING: When relying on signed FIT images with a required signature check the legacy image format is disabled by default, so that @@ -223,8 +223,8 @@ config SPL_LOAD_FIT 1. "loadables" images, other than FDTs, which do not have a "load" property will not be loaded. This limitation also applies to FPGA images with the correct "compatible" string. - 2. For FPGA images, the supported "compatible" list is in the - doc/uImage.FIT/source_file_format.txt. + 2. For FPGA images, the supported "compatible" list may be found in + https://fitspec.osfw.foundation/. 3. FDTs are only loaded for images with an "os" property of "u-boot". "linux" images are also supported with Falcon boot mode. -- 2.43.0

1 0

[PATCH] fs: btrfs: fix out of bounds write
by Alex Shumsky 18 Jun '24

18 Jun '24

Fix btrfs_read/read_and_truncate_page write out of bounds of destination buffer. Old behavior break bootstd malloc'd buffers of exact file size. Previously this OOB write have not been noticed because distroboot usually read files into huge static memory areas. Signed-off-by: Alex Shumsky <alexthreed(a)gmail.com> --- fs/btrfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4691612eda..b51f578b49 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -640,7 +640,7 @@ static int read_and_truncate_page(struct btrfs_path *path, extent_type = btrfs_file_extent_type(leaf, fi); if (extent_type == BTRFS_FILE_EXTENT_INLINE) { ret = btrfs_read_extent_inline(path, fi, buf); - memcpy(dest, buf + page_off, min(page_len, ret)); + memcpy(dest, buf + page_off, min(min(page_len, ret), len)); free(buf); return len; } @@ -652,7 +652,7 @@ static int read_and_truncate_page(struct btrfs_path *path, free(buf); return ret; } - memcpy(dest, buf + page_off, page_len); + memcpy(dest, buf + page_off, min(page_len, len)); free(buf); return len; } -- 2.34.1

5 4

[PATCH v5 0/3] automatically add /chosen/kaslr-seed and deduplicate code
by Tim Harvey 17 Jun '24

17 Jun '24

This series will automatically add /chosen/kaslr-seed to the dt if DM_RNG is enabled during the boot process. If RANDOMIZE_BASE is enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot. If we have DM_RNG enabled populate this value automatically when fdt_chosen is called. We skip this if ARMV8_SEC_FIRMWARE_SUPPORT is enabled as its implementation uses a different source of entropy that is not yet implemented as DM_RNG. We also skip this if MEASURED_BOOT is enabled as in that case any modifications to the dt will cause measured boot to fail (although there are many other places the dt is altered). As this fdt node is added elsewhere create a library function and use it to deduplicate code. We will provide a parameter to overwrite the node if present. For our automatic injection, we will use the first rng device and not overwrite if already present with a non-zero value (which may have been populated by an earlier boot stage). This way if a board specific ft_board_setup() function wants to customize this behavior it can call fdt_kaslrseed with a rng device index of its choosing and set overwrite true. Note that the kalsrseed command (CMD_KASLRSEED) is likely pointless now but left in place in case boot scripts exist that rely on this command existing and returning success. An informational message is printed to alert users of this command that it is likely no longer needed. Note that the Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over via efi_install_fdt() as it would also mess up the measured boot DTB TPM measurements as well. v5: - fixed typo in commit message s/it's/its/ - use cmd_process_error per Michal's suggestion - split into separate patches - remove the rng device index noting it as a future enhancement v4: - add missing /n to notice in kaslrseed cmd - combine ints in declaration - remove unused vars from board/xilinx/common/board.c ft_board_setup v3: - skip if CONFIG_MEASURED_BOOT - fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT - pass in rng index and bool to specify overwrite - remove duplicate error strings printed outside of fdt_kaslrseed - added note to commit log about how EFI STUB weeds out kalsr-seed v2: - fix typo in commit msg - use stack for seed to avoid unecessary malloc/free - move to a library function and deduplicate code by using it elsewhere Tim Harvey (3): Add fdt_kaslrseed function to add kaslr-seed to chosen node fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled use fdt_kaslrseed function to de-duplicate code board/xilinx/common/board.c | 40 ---------------------------- boot/fdt_support.c | 53 +++++++++++++++++++++++++++++++++++++ boot/pxe_utils.c | 34 +----------------------- cmd/kaslrseed.c | 49 +++++----------------------------- include/fdt_support.h | 10 +++++++ 5 files changed, 71 insertions(+), 115 deletions(-) -- 2.25.1

3 9

[GIT PULL] xilinx patches for v2024.10-rc1
by Michal Simek 17 Jun '24

17 Jun '24

Hi Tom, please pull these patches to your tree. Gitlab CI is not showing any issue. There are some alignments and improvements but overall nothing significant. The biggest patchset is add support for new AMD Versal Gen 2 SoC. Thanks, Michal The following changes since commit 0786dd573d0793417852e009dee3148ebdd163f3: test/py: net_boot: Add test cases for net boot (2024-06-13 16:31:24 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2024.10-rc1 for you to fetch changes up to e4a11e984d11cf4bbe55385cbae03c08f27ecd02: xilinx: Enable FF-A for all our arm64 SoCs (2024-06-17 16:02:30 +0200) ---------------------------------------------------------------- AMD/Xilinx changes for v2024.10-rc1 common: - spl: Introduce SoC specific init function xilinx: - Enable FF-A and NVMEM - Rename spl_board_init() to spl_soc_init() zynqmp: - DT alignments - Enable reset from SPL - Enable USB3 for KD240 - Align multiboot register on Kria for proper reboot - Allow multiboot environment write even in saved environment - Move zynqmp commands from board/ to arch/ - Clean up xilinx_zynqmp.h versal: - Do not prioritize boot device if driver is not enabled versal-net: - Setup location for redundant variables in SPI versal2: - Add support for new SOC mmc: - Fix tap delay for SD on Versal NET spi: - Add SPI_NOR_OCTAL_READ flag for mx66uw2g345gx0 flash part gpio: - Cover MODEPIN firmware dependency ---------------------------------------------------------------- Charlie Johnston (1): board: zynqmp: Move zynqmp commands from board/ to arch/ Kory Maincent (1): xilinx: zynqmp: Allow multiboot environment write even in saved environment Lukas Funke (3): spl: Introduce SoC specific init function arm64: zynq(mp): Rename spl_board_init() to spl_soc_init() xilinx: zynqmp: Enable reset_cpu() in SPL Michal Simek (11): xilinx: zynqmp: Clean up xilinx_zynqmp.h xilinx: Enable NVMEM framework for all platforms arm64: zynqmp: Update rproc node arm64: versal2: Add support for AMD Versal Gen 2 soc: versal2: Add SoC driver for AMD Versal Gen 2 mmc: versal2: Update zynq_sdhci driver to support AMD Versal Gen 2 spi: versal2: Enable spi drivers for Versal Gen 2 arm64: zynqmp: Setup multiboot register to 0 arm64: zynqmp: Align #address/size-cells with node gpio: Add proper dependency on ZYNQMP_FIRMWARE xilinx: Enable FF-A for all our arm64 SoCs Neal Frager (1): arm64: zynqmp: Enable usb3 for k24 som Prasad Kummari (1): mtd: spi-nor: Add SPI_NOR_OCTAL_READ flag for mx66uw2g345gx0 flash part Simek, Michal (1): sdhci: zynq: Fix tap delay for SD on Versal NET Venkatesh Yadav Abbarapu (2): xilinx: versal: Do not prioritize boot device if driver is not enabled xilinx: versal-net: Add env redund offset arch/arm/Kconfig | 18 +- arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/amd-versal2-virt.dts | 11 + arch/arm/dts/zynqmp-mini-nand.dts | 4 +- arch/arm/dts/zynqmp.dtsi | 67 +++- arch/arm/mach-versal2/Kconfig | 55 ++++ arch/arm/mach-versal2/Makefile | 10 + arch/arm/mach-versal2/clk.c | 34 ++ arch/arm/mach-versal2/cpu.c | 93 ++++++ arch/arm/mach-versal2/include/mach/hardware.h | 97 ++++++ arch/arm/mach-versal2/include/mach/sys_proto.h | 9 + arch/arm/mach-zynq/spl.c | 4 +- arch/arm/mach-zynqmp/Kconfig | 13 +- arch/arm/mach-zynqmp/Makefile | 4 + arch/arm/mach-zynqmp/spl.c | 4 +- board/xilinx/zynqmp/cmds.c => arch/arm/mach-zynqmp/zynqmp.c | 0 board/amd/common | 1 + board/amd/versal2/Kconfig | 16 + board/amd/versal2/MAINTAINERS | 7 + board/amd/versal2/Makefile | 11 + board/amd/versal2/board.c | 343 ++++++++++++++++++++ board/amd/versal2/cmds.c | 81 +++++ board/xilinx/Kconfig | 6 +- board/xilinx/versal/board.c | 15 + board/xilinx/zynqmp/Kconfig | 19 -- board/xilinx/zynqmp/Makefile | 4 - board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 23 +- board/xilinx/zynqmp/zynqmp.c | 20 +- board/xilinx/zynqmp/zynqmp_kria.env | 1 + common/spl/Kconfig | 7 + common/spl/spl.c | 3 + configs/amd_versal2_virt_defconfig | 151 +++++++++ configs/xilinx_versal_net_virt_defconfig | 3 + configs/xilinx_versal_virt_defconfig | 2 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_kria_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 2 + drivers/gpio/Kconfig | 4 +- drivers/mailbox/Kconfig | 2 +- drivers/mmc/zynq_sdhci.c | 24 +- drivers/mtd/spi/spi-nor-ids.c | 2 +- drivers/soc/Kconfig | 8 + drivers/soc/Makefile | 1 + drivers/soc/soc_amd_versal2.c | 77 +++++ drivers/spi/Kconfig | 2 +- drivers/spi/cadence_qspi.c | 3 +- drivers/spi/zynqmp_gqspi.c | 6 +- env/Kconfig | 6 +- include/configs/amd_versal2.h | 143 ++++++++ include/configs/xilinx_zynqmp.h | 6 - include/dt-bindings/power/xlnx-zynqmp-power.h | 17 +- include/spl.h | 8 + 53 files changed, 1359 insertions(+), 93 deletions(-) create mode 100644 arch/arm/dts/amd-versal2-virt.dts create mode 100644 arch/arm/mach-versal2/Kconfig create mode 100644 arch/arm/mach-versal2/Makefile create mode 100644 arch/arm/mach-versal2/clk.c create mode 100644 arch/arm/mach-versal2/cpu.c create mode 100644 arch/arm/mach-versal2/include/mach/hardware.h create mode 100644 arch/arm/mach-versal2/include/mach/sys_proto.h rename board/xilinx/zynqmp/cmds.c => arch/arm/mach-zynqmp/zynqmp.c (100%) create mode 120000 board/amd/common create mode 100644 board/amd/versal2/Kconfig create mode 100644 board/amd/versal2/MAINTAINERS create mode 100644 board/amd/versal2/Makefile create mode 100644 board/amd/versal2/board.c create mode 100644 board/amd/versal2/cmds.c delete mode 100644 board/xilinx/zynqmp/Kconfig create mode 100644 configs/amd_versal2_virt_defconfig create mode 100644 drivers/soc/soc_amd_versal2.c create mode 100644 include/configs/amd_versal2.h

2 1

[PATCH v1 0/4] Initial support for new Tegra 2/3 devices
by Svyatoslav Ryhel 17 Jun '24

17 Jun '24

Patchset includes initial support bringup for 4 new Tegra 2 and Tegra 3 devices which include Asus Transformers with Tegra 2, Microfost Surface RT, Lenovo Ideapad Yoga 11 and Wexler Tab 7t. All setups are tested on real hardware and pass buildman. Jonas Schwöbel (2): board: microsoft: surface-rt: add Microsoft Surface RT support board: lenovo: ideapad-yoga-11: Lenovo Ideapad Yoga 11 Svyatoslav Ryhel (2): board: asus: transformer: add ASUS Transformer T20 family support board: wexler: qc750: add WEXLER Tab 7t support arch/arm/dts/Makefile | 9 +- arch/arm/dts/tegra20-asus-sl101.dts | 9 + arch/arm/dts/tegra20-asus-tf101.dts | 9 + arch/arm/dts/tegra20-asus-tf101g.dts | 9 + arch/arm/dts/tegra20-asus-transformer.dtsi | 545 +++++++ .../dts/tegra30-lenovo-ideapad-yoga-11.dts | 1266 +++++++++++++++++ arch/arm/dts/tegra30-microsoft-surface-rt.dts | 1083 ++++++++++++++ arch/arm/dts/tegra30-wexler-qc750.dts | 1106 ++++++++++++++ arch/arm/mach-tegra/tegra20/Kconfig | 5 + arch/arm/mach-tegra/tegra30/Kconfig | 15 + board/asus/transformer-t20/Kconfig | 12 + board/asus/transformer-t20/MAINTAINERS | 8 + board/asus/transformer-t20/Makefile | 9 + .../asus/transformer-t20/configs/sl101.config | 1 + .../asus/transformer-t20/configs/tf101.config | 1 + .../transformer-t20/configs/tf101g.config | 1 + board/asus/transformer-t20/transformer-t20.c | 57 + board/lenovo/ideapad-yoga-11/Kconfig | 12 + board/lenovo/ideapad-yoga-11/MAINTAINERS | 7 + board/lenovo/ideapad-yoga-11/Makefile | 6 + .../ideapad-yoga-11/ideapad-yoga-11-spl.c | 41 + board/microsoft/surface-rt/Kconfig | 12 + board/microsoft/surface-rt/MAINTAINERS | 7 + board/microsoft/surface-rt/Makefile | 6 + board/microsoft/surface-rt/surface-rt-spl.c | 41 + board/wexler/qc750/Kconfig | 12 + board/wexler/qc750/MAINTAINERS | 7 + board/wexler/qc750/Makefile | 11 + board/wexler/qc750/qc750-spl.c | 45 + board/wexler/qc750/qc750.c | 21 + configs/ideapad-yoga-11_defconfig | 84 ++ configs/qc750_defconfig | 81 ++ configs/surface-rt_defconfig | 80 ++ configs/transformer_t20_defconfig | 82 ++ doc/board/asus/index.rst | 1 + doc/board/asus/transformer_t20.rst | 129 ++ doc/board/index.rst | 3 + doc/board/lenovo/ideapad-yoga-11.rst | 41 + doc/board/lenovo/index.rst | 9 + doc/board/microsoft/index.rst | 9 + doc/board/microsoft/surface-rt.rst | 41 + doc/board/wexler/index.rst | 9 + doc/board/wexler/qc750.rst | 125 ++ include/configs/ideapad-yoga-11.h | 79 + include/configs/qc750.h | 67 + include/configs/surface-rt.h | 41 + include/configs/transformer-t20.h | 23 + 47 files changed, 5276 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/tegra20-asus-sl101.dts create mode 100644 arch/arm/dts/tegra20-asus-tf101.dts create mode 100644 arch/arm/dts/tegra20-asus-tf101g.dts create mode 100644 arch/arm/dts/tegra20-asus-transformer.dtsi create mode 100644 arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts create mode 100644 arch/arm/dts/tegra30-microsoft-surface-rt.dts create mode 100644 arch/arm/dts/tegra30-wexler-qc750.dts create mode 100644 board/asus/transformer-t20/Kconfig create mode 100644 board/asus/transformer-t20/MAINTAINERS create mode 100644 board/asus/transformer-t20/Makefile create mode 100644 board/asus/transformer-t20/configs/sl101.config create mode 100644 board/asus/transformer-t20/configs/tf101.config create mode 100644 board/asus/transformer-t20/configs/tf101g.config create mode 100644 board/asus/transformer-t20/transformer-t20.c create mode 100644 board/lenovo/ideapad-yoga-11/Kconfig create mode 100644 board/lenovo/ideapad-yoga-11/MAINTAINERS create mode 100644 board/lenovo/ideapad-yoga-11/Makefile create mode 100644 board/lenovo/ideapad-yoga-11/ideapad-yoga-11-spl.c create mode 100644 board/microsoft/surface-rt/Kconfig create mode 100644 board/microsoft/surface-rt/MAINTAINERS create mode 100644 board/microsoft/surface-rt/Makefile create mode 100644 board/microsoft/surface-rt/surface-rt-spl.c create mode 100644 board/wexler/qc750/Kconfig create mode 100644 board/wexler/qc750/MAINTAINERS create mode 100644 board/wexler/qc750/Makefile create mode 100644 board/wexler/qc750/qc750-spl.c create mode 100644 board/wexler/qc750/qc750.c create mode 100644 configs/ideapad-yoga-11_defconfig create mode 100644 configs/qc750_defconfig create mode 100644 configs/surface-rt_defconfig create mode 100644 configs/transformer_t20_defconfig create mode 100644 doc/board/asus/transformer_t20.rst create mode 100644 doc/board/lenovo/ideapad-yoga-11.rst create mode 100644 doc/board/lenovo/index.rst create mode 100644 doc/board/microsoft/index.rst create mode 100644 doc/board/microsoft/surface-rt.rst create mode 100644 doc/board/wexler/index.rst create mode 100644 doc/board/wexler/qc750.rst create mode 100644 include/configs/ideapad-yoga-11.h create mode 100644 include/configs/qc750.h create mode 100644 include/configs/surface-rt.h create mode 100644 include/configs/transformer-t20.h -- 2.43.0

2 7

[PATCH next v3 0/6] rockchip: display PMIC variant properly + misc fixes for Theobroma boards
by Quentin Schulz 17 Jun '24

17 Jun '24

This fixes how the Rockchip PMIC variant is shown for all but RK808 by stripping the LSB. Also fix the size of the environment on Jaguar to match the default (smaller) size. Fix SPL_PAD_TO on Ringneck. Remove duplicated default value of ENV_OFFSET in puma defconfig. Remove unnecessary override of the fit offset in u-boot dtsi for Puma and Ringneck. Fix TPL_MAX_SIZE for Ringneck to match the (valid) default value for PX30 boards. Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- Changes in v3: - add missing bitfield include in PMIC patch - Link to v2: https://lore.kernel.org/r/20240605-misc-tsd-v2-0-12479432c90f@cherry.de Changes in v2: - add patch for fixing TPL_MAX_SIZE on PX30 Ringneck - print show_variant when PMIC variant not found - use bitfield_extract_by_mask instead of using hardcoded shift operator - Link to v1: https://lore.kernel.org/r/20240524-misc-tsd-v1-0-b7bde1344b9e@cherry.de --- Quentin Schulz (6): rockchip: jaguar-rk3588: use default env size for Rockchip on MMC rockchip: rk3399-puma: remove default value from defconfig rockchip: rk3399-puma: remove unnecessary simple-bin:fit:offset override rockchip: px30-ringneck: Update SPL_PAD_TO Kconfig option power: rk8xx: properly print all supported PMICs name rockchip: ringneck-px30: fix TPL_MAX_SIZE arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 8 -------- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 6 ------ configs/jaguar-rk3588_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/ringneck-px30_defconfig | 3 +-- drivers/power/pmic/rk8xx.c | 6 +++--- 6 files changed, 4 insertions(+), 21 deletions(-) --- base-commit: 8887ffb625f65475fd6619f8b05fb7a5a12b016b change-id: 20240524-misc-tsd-e08551c01c8a Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 11

[PATCH 1/2] phy: Extend generic_setup_phy() with PHY mode and submode
by Marek Vasut 17 Jun '24

17 Jun '24

Extend generic_setup_phy() parameter list with PHY mode and submode and call generic_phy_set_mode() in generic_setup_phy(), so the generic PHY setup function can configure the PHY into correct mode before powering the PHY up. Update all call sites of generic_setup_phy() as well, all of which are USB host related, except for DM test which now behaves as a USB host test. Note that if the PHY driver does not implement the .set_mode callback, generic_phy_set_mode() call returns 0 and does not error out, so this should not break any existing systems. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Caleb Connolly <caleb.connolly(a)linaro.org> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Fabrice Gasnier <fabrice.gasnier(a)foss.st.com> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Mathieu Othacehe <othacehe(a)gnu.org> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Cc: Neil Armstrong <neil.armstrong(a)linaro.org> Cc: Nishanth Menon <nm(a)ti.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Xavier Drudis Ferran <xdrudis(a)tinet.cat> Cc: u-boot-qcom(a)groups.io Cc: u-boot(a)lists.denx.de --- drivers/phy/phy-uclass.c | 7 ++++++- drivers/usb/host/ehci-generic.c | 2 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-mx6.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ohci-generic.c | 2 +- include/generic-phy.h | 5 ++++- test/dm/phy.c | 8 ++++---- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c index acdcda15b5b..bbaf95112c5 100644 --- a/drivers/phy/phy-uclass.c +++ b/drivers/phy/phy-uclass.c @@ -508,7 +508,8 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk) return ret; } -int generic_setup_phy(struct udevice *dev, struct phy *phy, int index) +int generic_setup_phy(struct udevice *dev, struct phy *phy, int index, + enum phy_mode mode, int submode) { int ret; @@ -520,6 +521,10 @@ int generic_setup_phy(struct udevice *dev, struct phy *phy, int index) if (ret) return ret; + ret = generic_phy_set_mode(phy, mode, submode); + if (ret) + generic_phy_exit(phy); + ret = generic_phy_power_on(phy); if (ret) generic_phy_exit(phy); diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 23c3ed25554..1ae3619ce25 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -94,7 +94,7 @@ static int ehci_usb_probe(struct udevice *dev) if (err) goto reset_err; - err = generic_setup_phy(dev, &priv->phy, 0); + err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0); if (err) goto regulator_err; diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index a081f71b187..b0c060b8173 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -56,7 +56,7 @@ static int ehci_usb_probe(struct udevice *dev) hcor = (struct ehci_hcor *)((phys_addr_t)hccr + HC_LENGTH(ehci_readl(&(hccr)->cr_capbase))); - ret = generic_setup_phy(dev, &p->phy, 0); + ret = generic_setup_phy(dev, &p->phy, 0, PHY_MODE_USB_HOST, 0); if (ret) return ret; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 31cd8a50f4a..a93fa5d5455 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -703,7 +703,7 @@ static int ehci_usb_probe(struct udevice *dev) usb_phy_enable(ehci, priv->phy_addr); #endif #else - ret = generic_setup_phy(dev, &priv->phy, 0); + ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0); if (ret) goto err_regulator; #endif diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 572686580cd..8d05b14e898 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -30,7 +30,7 @@ static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr, int ret; u32 cmd; - ret = generic_setup_phy(dev, &priv->phy, 0); + ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0); if (ret) return ret; diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index f1325cd4953..cc44226f5e0 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -50,7 +50,7 @@ static int ohci_usb_probe(struct udevice *dev) goto reset_err; } - err = generic_setup_phy(dev, &priv->phy, 0); + err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0); if (err) goto reset_err; diff --git a/include/generic-phy.h b/include/generic-phy.h index eaab7491660..47962023236 100644 --- a/include/generic-phy.h +++ b/include/generic-phy.h @@ -415,10 +415,13 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk); * @dev: The consumer device. * @phy: A pointer to the PHY port * @index: The index in the list of available PHYs + * @mode: PHY mode + * @submode: PHY submode * * Return: 0 if OK, or negative error code. */ -int generic_setup_phy(struct udevice *dev, struct phy *phy, int index); +int generic_setup_phy(struct udevice *dev, struct phy *phy, int index, + enum phy_mode mode, int submode); /** * generic_shutdown_phy() - Power off and de-initialize phy. diff --git a/test/dm/phy.c b/test/dm/phy.c index d14117f6f7a..a90881b12ab 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -243,20 +243,20 @@ static int dm_test_phy_setup(struct unit_test_state *uts) "gen_phy_user", &parent)); /* normal */ - ut_assertok(generic_setup_phy(parent, &phy, 0)); + ut_assertok(generic_setup_phy(parent, &phy, 0, PHY_MODE_USB_HOST, 0)); ut_assertok(generic_shutdown_phy(&phy)); /* power_off fail with -EIO */ - ut_assertok(generic_setup_phy(parent, &phy, 1)); + ut_assertok(generic_setup_phy(parent, &phy, 1, PHY_MODE_USB_HOST, 0)); ut_asserteq(-EIO, generic_shutdown_phy(&phy)); /* power_on fail with -EIO */ - ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2)); + ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2, PHY_MODE_USB_HOST, 0)); ut_assertok(generic_shutdown_phy(&phy)); /* generic_phy_get_by_index fail with -ENOENT */ ut_asserteq(-ENOENT, generic_phy_get_by_index(parent, 3, &phy)); - ut_assertok(generic_setup_phy(parent, &phy, 3)); + ut_assertok(generic_setup_phy(parent, &phy, 3, PHY_MODE_USB_HOST, 0)); ut_assertok(generic_shutdown_phy(&phy)); return 0; -- 2.43.0

4 5

[PULL] Pull request for u-boot-nand-20240617
by Dario Binacchi 17 Jun '24

17 Jun '24

Hello Tom, The following changes since commit 2248c96ea1cf0b65377040d9f87ce7d8cf534c63: Merge tag 'u-boot-stm32-20240614' of https://source.denx.de/u-boot/custodians/u-boot-stm (2024-06-14 08:13:54 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git tags/u-boot-nand-20240617 for you to fetch changes up to aad8aa56d96b1305ae5a9708b604b2f2a4e97c4e: mtd: nand: pxa3xx: Incorrect bitflip return on page read (2024-06-17 09:43:45 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-nand-flash/-/pipelines/21158 ---------------------------------------------------------------- Pull request for u-boot-nand-20240617 The first patch is by Arseniy Krasnov and adds support for OTP area access on MX30LFxG18AC chip series. The second patch is by John Watts and adds MTD dependency in Kconfig for UBI. The last patch is by Ravi Minnikanti and fixes bitflip return value on page read. ---------------------------------------------------------------- Arseniy Krasnov (1): mtd: rawnand: macronix: OTP access for MX30LFxG18AC John Watts (1): ubi: Depend on MTD Ravi Minnikanti (1): mtd: nand: pxa3xx: Incorrect bitflip return on page read drivers/mtd/nand/raw/nand_macronix.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/pxa3xx_nand.c | 5 +++ drivers/mtd/ubi/Kconfig | 1 + 3 files changed, 176 insertions(+) -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi(a)amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info(a)amarulasolutions.com www.amarulasolutions.com

2 1

Re: [PULL] Pull request for u-boot master / v2024.07 = u-boot-stm32-20240617
by Tom Rini 17 Jun '24

17 Jun '24

On Mon, Jun 17, 2024 at 11:06:24AM +0200, Patrice CHOTARD wrote: > Please pull the STM32 related fixes for u-boot/master, v2024.07: u-boot-stm32-20240617 > > CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/21155 > > The following changes since commit 2248c96ea1cf0b65377040d9f87ce7d8cf534c63: > > Merge tag 'u-boot-stm32-20240614' of https://source.denx.de/u-boot/custodians/u-boot-stm (2024-06-14 08:13:54 -0600) > > are available in the Git repository at: > > https://source.denx.de/u-boot/custodians/u-boot-stm.git tags/u-boot-stm32-20240617 > > for you to fetch changes up to 9968e8dbf3887c692dd7f2f83bd43678acd394a5: > > ARM: dts: stm32: Ping IWDG on exit from PSCI suspend code (2024-06-17 09:52:38 +0200) > Applied to u-boot/master, thanks! -- Tom

1 0

[PATCH v3 0/2] drivers: bootcount: Add support for ANY filesystem
by Vasileios Amoiridis 17 Jun '24

17 Jun '24

Changes in v3: - Remove specific CONFIGs for filesystems - Add message to prompt user to enable required write function - Use tags from previous rounds - Move documentation to rST v2: https://lore.kernel.org/u-boot/20240610185116.353604-1-vassilisamir@gmail.c… Changes in v2: - Use generic code by utilizing FS_TYPE_ANY - Change filename from bootcount_ext.c to bootcount_fs.c v1: https://lore.kernel.org/u-boot/20240605181041.68317-1-vassilisamir@gmail.co… This patch adds support to save the bootcount variable in a file located in FAT filesystem. Up to now, there was support only for EXT filesystem. The reason I put this as RFC is because the file "bootcount_ext.c" will no longer represent the implementation for the EXT filesystem, but also for the FAT filesystem. Should it be renamed? If not, wouldn't it be inconsistent? Cheers, Vasilis Vasileios Amoiridis (2): drivers: bootcount: Add support for ANY filesystem doc: api: bootcount: Convert to rST documentation doc/README.bootcount | 53 ----------------- doc/api/bootcount.rst | 58 +++++++++++++++++++ drivers/bootcount/Kconfig | 36 ++++++------ drivers/bootcount/Makefile | 2 +- .../{bootcount_ext.c => bootcount_fs.c} | 12 ++-- 5 files changed, 83 insertions(+), 78 deletions(-) delete mode 100644 doc/README.bootcount create mode 100644 doc/api/bootcount.rst rename drivers/bootcount/{bootcount_ext.c => bootcount_fs.c} (81%) -- 2.25.1

4 7

[PATCH v3] arm: dts: k3-am625-beagleplay: Add symlinks for tiboot3 and tispl
by Dhruva Gole 17 Jun '24

17 Jun '24

Add symlinks for both tiboot3.bin and tispl.bin because a user has to anyway rename these files to get the platform to boot up. This just makes it more intuitive and convenient. Signed-off-by: Dhruva Gole <d-gole(a)ti.com> --- This is just a RESEND of v1, because the changes in v2 were not required. Link to previous revision: https://lore.kernel.org/u-boot/20240614115340.4091211-1-d-gole@ti.com/ arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 1 + arch/arm/dts/k3-am625-r5-beagleplay.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi index fb2032068d1c..bd48af8d186a 100644 --- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi @@ -71,6 +71,7 @@ ti-spl_unsigned { filename = "tispl.bin_unsigned"; + symlink = "tispl.bin"; pad-byte = <0xff>; fit { diff --git a/arch/arm/dts/k3-am625-r5-beagleplay.dts b/arch/arm/dts/k3-am625-r5-beagleplay.dts index 9db58f093c8c..da6746e009d5 100644 --- a/arch/arm/dts/k3-am625-r5-beagleplay.dts +++ b/arch/arm/dts/k3-am625-r5-beagleplay.dts @@ -79,6 +79,7 @@ &binman { tiboot3-am62x-gp-evm.bin { filename = "tiboot3-am62x-gp-evm.bin"; + symlink = "tiboot3.bin"; ti-secure-rom { content = <&u_boot_spl_unsigned>, <&ti_fs_gp>, <&combined_tifs_cfg_gp>, <&combined_dm_cfg_gp>; base-commit: 1ebd659cf020843fd8e8ef90d85a66941cbab6ec -- 2.34.1

3 2

[PATCH] board: beagleplay: Fix the bootpart to pick from root partition
by Dhruva Gole 17 Jun '24

17 Jun '24

The Kernel Image and DTB files are supposed to be picked from the rootfs of the SD Card, this fails in legacy boot flow because bootpart is set to 1:1. Fix it. Fixes: a200f428b5b21 ("board: ti: am62x: Add am62x_beagleplay_* defconfigs and env file") Signed-off-by: Dhruva Gole <d-gole(a)ti.com> --- board/beagle/beagleplay/beagleplay.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/beagle/beagleplay/beagleplay.env b/board/beagle/beagleplay/beagleplay.env index bbf6b925d02c..190181c8ad0c 100644 --- a/board/beagle/beagleplay/beagleplay.env +++ b/board/beagle/beagleplay/beagleplay.env @@ -11,7 +11,7 @@ set_led_state_start_load=led led-0 on; led led-1 off; led led-2 on; led led-3 off; led led-4 on boot=mmc mmcdev=1 -bootpart=1:1 +bootpart=1:2 bootdir=/boot boot_targets=mmc1 mmc0 bootmeths=script extlinux efi pxe -- 2.34.1

6 12

[PATCH 1/1] usb: informative message if no controller
by Heinrich Schuchardt 17 Jun '24

17 Jun '24

The message 'No working controllers found' provides no clue that this refers to USB controllers. Provide a message that refers to USB. Use log_info(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/usb/host/usb-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d66..e16432a1516 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -388,7 +388,7 @@ int usb_init(void) /* if we were not able to find at least one working bus, bail out */ if (controllers_initialized == 0) - printf("No working controllers found\n"); + log_info("No USB controller\n"); return usb_started ? 0 : -ENOENT; } -- 2.43.0

3 2

Pull request efi-2024-07-rc5-2
by Heinrich Schuchardt 17 Jun '24

17 Jun '24

Dear Tom, The following changes since commit 2248c96ea1cf0b65377040d9f87ce7d8cf534c63: Merge tag 'u-boot-stm32-20240614' of https://source.denx.de/u-boot/custodians/u-boot-stm (2024-06-14 08:13:54 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2024-07-rc5-2 for you to fetch changes up to d1499a8b3fa30e4d835a139e958fc7bec96af412: doc: Fix link reference to general verified boot docs (2024-06-16 10:37:10 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/21141 ---------------------------------------------------------------- Pull request efi-2024-07-rc5-2 Documentation: * Correct links and board names in PHYTEC board descriptions. * Describe UEFI measured boot. * Fix typos in include/bootmeth.h. * Fix link reference to general verified boot docs. UEFI: * Measure device-tree into PCR1 instead of PCR0 ---------------------------------------------------------------- Alexander Dahl (1): doc: Fix link reference to general verified boot docs Daniel Schultz (3): doc: board: phytec: phycore-am62x: Fix Link to Documentation doc: board: phytec: phycore-am64x: Fix Link to Documentation doc: board: phytec: phycore-am64: Fix phyBOARD Name Ilias Apalodimas (2): tpm: measure DTB in PCR1 instead of PCR0 doc: describe UEFI measured boot Mattijs Korpershoek (1): bootstd: Fix a handful of doc typos in bootmeth boot/bootm.c | 2 +- doc/board/phytec/phycore-am62x.rst | 2 +- doc/board/phytec/phycore-am64x.rst | 4 ++-- doc/usage/fit/signature.rst | 2 +- doc/usage/measured_boot.rst | 35 +++++++++++++++++++++++++++++++---- include/bootmeth.h | 12 ++++++------ lib/efi_loader/efi_tcg2.c | 2 +- 7 files changed, 43 insertions(+), 16 deletions(-)

2 1

Please pull u-boot-watchdog/next
by Stefan Roese 17 Jun '24

17 Jun '24

Hi Tom, please pull the following watchdog & cyclic related patches: ---------------------------------------------------------------- - misc cyclic infrastructure improvements (Rasmus) - watchdog_reset cleanup (Rasmus) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=369&view=results Thanks, Stefan The following changes since commit 0786dd573d0793417852e009dee3148ebdd163f3: test/py: net_boot: Add test cases for net boot (2024-06-13 16:31:24 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-watchdog.git next for you to fetch changes up to 85c476759a42dfedb2d66e9734f8c05b7cfb62d5: powerpc: mpc85xx: remove dead watchdog-related code (2024-06-16 12:14:18 +0200) ---------------------------------------------------------------- Rasmus Villemoes (10): cyclic: stop strdup'ing name in cyclic_register() wdt-uclass: prevent multiple cyclic_register calls cyclic: make clients embed a struct cyclic_info in their own data structure m68k: remove dead code wdt-uclass: watchdog_reset cleanup serial: ns16550: fix comment to mention schedule instead of watchdog_reset sh4: move reset_cpu() from watchdog.c to cpu.c sh4: remove watchdog.c file powerpc: mpc83xx: remove unused watchdog_reset() function powerpc: mpc85xx: remove dead watchdog-related code arch/m68k/cpu/mcf52x2/cpu.c | 108 ------------------------------------- arch/powerpc/cpu/mpc83xx/cpu.c | 15 ------ arch/powerpc/cpu/mpc85xx/cpu.c | 31 ----------- arch/sh/cpu/sh4/Makefile | 2 +- arch/sh/cpu/sh4/cpu.c | 10 ++++ arch/sh/cpu/sh4/watchdog.c | 60 --------------------- board/Marvell/octeon_nic23/board.c | 11 ++-- cmd/cyclic.c | 12 ++--- common/cyclic.c | 24 +++------ doc/develop/cyclic.rst | 26 +++++---- drivers/serial/ns16550.c | 8 +-- drivers/watchdog/wdt-uclass.c | 57 ++++++++------------ include/cyclic.h | 37 ++++++------- include/watchdog.h | 3 -- test/common/cyclic.c | 19 ++++--- 15 files changed, 102 insertions(+), 321 deletions(-) delete mode 100644 arch/sh/cpu/sh4/watchdog.c

2 1

Pull request: u-boot-rockchip-next-20240615
by Kever Yang 17 Jun '24

17 Jun '24

Hi Tom, Please pull the updates for next on rockchip platform: - New board: Theobroma Systems SOM-RK3588-Q7 Tiger, ArmSoM Sige7 Rk3588; - PX30 dts migrate to OF_UPSTREAM; - Some other update on board or config; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/21113 Thanks, - Kever The following changes since commit 3db3a6ba7b0cb09757fc631ccc9d4445eb101dc7: Merge patch series "Enable OSPI boot for j721s2" (2024-06-13 08:20:30 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-next-20240615 for you to fetch changes up to ae4aaa44977cbe522e9f38f2ac2ac07a784bf867: rockchip: puma-rk3399: get closer to other Theobroma defconfigs (2024-06-14 17:35:45 +0800) ---------------------------------------------------------------- Boris Brezillon (1): arm64: dts: rockchip: Add rk3588 GPU node Diederik de Haas (1): arm64: dts: rockchip: Fix ordering of nodes on rk3588s Heiko Stuebner (6): arm64: dts: rockchip: enable gpu on rk3588-tiger arm64: dts: rockchip: move uart2 pinmux to dtsi on rk3588-tiger arm64: dts: rockchip: fix pcie-refclk frequency on rk3588 tiger arm64: dts: rockchip: fix comment for upper usb3 port arm64: dts: rockchip: add usb-id extcon on rk3588 tiger arm64: dts: rockchip: add dual-role usb3 hosts to rk3588 Tiger-Haikou Jianfeng Liu (3): arm64: dts: rockchip: Add ArmSom Sige7 board rockchip: rk3588: Remove USB3 DRD nodes in u-boot.dtsi board: rockchip: add ArmSoM Sige7 Rk3588 board Jing Luo (1): arm64: dts: rockchip: correct gpio_pwrctrl1 typos on rk3588(s) boards Niklas Cassel (1): arm64: dts: rockchip: add rk3588 pcie and php IOMMUs Quentin Schulz (17): rockchip: evb-px30: Use common bss and stack addresses rockchip: firefly-px30: Use common bss and stack addresses rockchip: odroid-go2: Use common bss and stack addresses rockchip: px30-core-*: Use common bss and stack addresses rockchip: px30: make UART pinmux accessible to TPL/SPL DTB rockchip: evb-px30: do not remove pinctrl nodes from SPL DTB rockchip: evb-px30: make UART5 the debug UART rockchip: px30/rk3326: migrate to OF_UPSTREAM rockchip: jaguar-rk3588: use default env size for Rockchip on MMC rockchip: rk3399-puma: remove default value from defconfig rockchip: rk3399-puma: remove unnecessary simple-bin:fit:offset override rockchip: px30-ringneck: Update SPL_PAD_TO Kconfig option power: rk8xx: properly print all supported PMICs name rockchip: ringneck-px30: fix TPL_MAX_SIZE rockchip: add support for Theobroma Systems SOM-RK3588-Q7 Tiger module rockchip: ringneck-px30: get closer to other Theobroma defconfigs rockchip: puma-rk3399: get closer to other Theobroma defconfigs Sebastian Reichel (4): arm64: dts: rockchip: fix usb2phy nodename for rk3588 arm64: dts: rockchip: reorder usb2phy properties for rk3588 arm64: dts: rockchip: add USBDP phys on rk3588 arm64: dts: rockchip: add USB3 DRD controllers on rk3588 MAINTAINERS | 1 + arch/arm/dts/Makefile | 8 - arch/arm/dts/px30-engicam-common.dtsi | 129 ---- arch/arm/dts/px30-engicam-ctouch2.dtsi | 30 - arch/arm/dts/px30-engicam-edimm2.2.dtsi | 66 -- .../dts/px30-engicam-px30-core-ctouch2-of10.dts | 77 --- arch/arm/dts/px30-engicam-px30-core-ctouch2.dts | 22 - arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts | 43 -- arch/arm/dts/px30-engicam-px30-core.dtsi | 241 ------- arch/arm/dts/px30-evb.dts | 634 ------------------ arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 8 - arch/arm/dts/px30-ringneck-haikou.dts | 232 ------- arch/arm/dts/px30-ringneck.dtsi | 382 ----------- arch/arm/dts/px30-u-boot.dtsi | 16 + arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 15 + arch/arm/dts/rk3326-odroid-go2.dts | 642 ------------------ arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 6 - arch/arm/dts/rk3588-armsom-sige7-u-boot.dtsi | 6 + arch/arm/dts/rk3588-tiger-haikou-u-boot.dtsi | 37 ++ arch/arm/dts/rk3588-u-boot.dtsi | 74 --- arch/arm/dts/rk3588s-u-boot.dtsi | 85 --- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3588/Kconfig | 57 ++ board/armsom/sige7-rk3588/Kconfig | 12 + board/armsom/sige7-rk3588/MAINTAINERS | 7 + board/theobroma-systems/tiger_rk3588/Kconfig | 16 + board/theobroma-systems/tiger_rk3588/MAINTAINERS | 13 + board/theobroma-systems/tiger_rk3588/Makefile | 10 + .../theobroma-systems/tiger_rk3588/tiger_rk3588.c | 53 ++ configs/evb-px30_defconfig | 24 +- configs/firefly-px30_defconfig | 19 +- configs/jaguar-rk3588_defconfig | 1 - configs/odroid-go2_defconfig | 20 +- configs/puma-rk3399_defconfig | 10 +- configs/px30-core-ctouch2-of10-px30_defconfig | 20 +- configs/px30-core-ctouch2-px30_defconfig | 20 +- configs/px30-core-edimm2.2-px30_defconfig | 20 +- configs/ringneck-px30_defconfig | 21 +- configs/sige7-rk3588_defconfig | 93 +++ configs/tiger-rk3588_defconfig | 113 ++++ doc/board/rockchip/rockchip.rst | 2 + doc/board/theobroma-systems/index.rst | 1 + doc/board/theobroma-systems/tiger_rk3588.rst | 102 +++ drivers/power/pmic/rk8xx.c | 6 +- .../src/arm64/rockchip/rk3588-armsom-sige7.dts | 721 +++++++++++++++++++++ .../src/arm64/rockchip/rk3588-coolpi-cm5.dtsi | 2 +- .../rockchip/rk3588-edgeble-neu6a-common.dtsi | 2 +- dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts | 2 +- .../src/arm64/rockchip/rk3588-tiger-haikou.dts | 65 +- dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi | 29 +- .../src/arm64/rockchip/rk3588-turing-rk1.dtsi | 2 +- dts/upstream/src/arm64/rockchip/rk3588.dtsi | 72 ++ .../src/arm64/rockchip/rk3588s-coolpi-4b.dts | 2 +- .../src/arm64/rockchip/rk3588s-indiedroid-nova.dts | 2 +- .../src/arm64/rockchip/rk3588s-orangepi-5.dts | 2 +- .../src/arm64/rockchip/rk3588s-rock-5a.dts | 2 +- dts/upstream/src/arm64/rockchip/rk3588s.dtsi | 377 ++++++++--- include/configs/sige7-rk3588.h | 15 + include/configs/tiger_rk3588.h | 15 + 59 files changed, 1795 insertions(+), 2910 deletions(-) delete mode 100644 arch/arm/dts/px30-engicam-common.dtsi delete mode 100644 arch/arm/dts/px30-engicam-ctouch2.dtsi delete mode 100644 arch/arm/dts/px30-engicam-edimm2.2.dtsi delete mode 100644 arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts delete mode 100644 arch/arm/dts/px30-engicam-px30-core-ctouch2.dts delete mode 100644 arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts delete mode 100644 arch/arm/dts/px30-engicam-px30-core.dtsi delete mode 100644 arch/arm/dts/px30-evb.dts delete mode 100644 arch/arm/dts/px30-ringneck-haikou.dts delete mode 100644 arch/arm/dts/px30-ringneck.dtsi delete mode 100644 arch/arm/dts/rk3326-odroid-go2.dts create mode 100644 arch/arm/dts/rk3588-armsom-sige7-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-tiger-haikou-u-boot.dtsi create mode 100644 board/armsom/sige7-rk3588/Kconfig create mode 100644 board/armsom/sige7-rk3588/MAINTAINERS create mode 100644 board/theobroma-systems/tiger_rk3588/Kconfig create mode 100644 board/theobroma-systems/tiger_rk3588/MAINTAINERS create mode 100644 board/theobroma-systems/tiger_rk3588/Makefile create mode 100644 board/theobroma-systems/tiger_rk3588/tiger_rk3588.c create mode 100644 configs/sige7-rk3588_defconfig create mode 100644 configs/tiger-rk3588_defconfig create mode 100644 doc/board/theobroma-systems/tiger_rk3588.rst create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts create mode 100644 include/configs/sige7-rk3588.h create mode 100644 include/configs/tiger_rk3588.h

2 1

Pull request: u-boot-rockchip-20240614
by Kever Yang 17 Jun '24

17 Jun '24

Hi Tom, Please pull the fixex for rockchip platform: - pmic fix for rk8xx; - pinctrl fix for rk3188/rv1126/rk3588; - mkimage fix for rockcihp "-l" option; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/21111 Thanks, - Kever The following changes since commit ca6a992e09441d6cca73439c63c3735f86b36ea4: cmd: sound: fix help text (2024-06-13 09:31:56 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20240614 for you to fetch changes up to 3f9a19befe9277db2a337552912c6ddbcc0c8b10: rockchip: mkimage: fix mkimage -l for header v1 (2024-06-14 17:07:59 +0800) ---------------------------------------------------------------- Chris Morgan (2): Revert "board: rockchip: Add early ADC button detect for RGxx3" board: rockchip: rgxx3: Use sdmmc0 as first device Jonas Karlman (3): pinctrl: rockchip: rk3188: Fix support for IOMUX_GPIO_ONLY flag pinctrl: rockchip: rv1126: Fix support for IOMUX_L_SOURCE_PMU flag pinctrl: rockchip: rk3588: Fix support for rockchip_get_mux() Quentin Schulz (4): regulator: rk8xx: fix incorrect device used for _ldo_[sg]et_suspend_value regulator: rk8xx: pass pmic udevice instead of regulator to all internal functions regulator: rk8xx: clarify operator precedence rockchip: mkimage: fix mkimage -l for header v1 arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 2 +- board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 64 ------------------------ drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 40 ++++++++++++--- drivers/power/regulator/rk8xx.c | 54 ++++++++++---------- tools/rkcommon.c | 2 +- 5 files changed, 63 insertions(+), 99 deletions(-)

2 1

[GIT PULL] Please pull u-boot-imx-master-20240614
by Fabio Estevam 17 Jun '24

17 Jun '24

Hi Tom, Please pull this single fix from u-boot-imx/master, thanks. The following changes since commit ca6a992e09441d6cca73439c63c3735f86b36ea4: cmd: sound: fix help text (2024-06-13 09:31:56 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20240614 for you to fetch changes up to 09d63e647a0eee024b493ad1d0e0d4a7a65ae500: board: imx8mn_s2: Update timing with production one (2024-06-14 11:42:19 -0300) u-boot-imx-master-20240614 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/21125 - Update imx8mn_s2 DDR initialization to fix USB boot. ---------------------------------------------------------------- Michael Trimarchi (1): board: imx8mn_s2: Update timing with production one board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c | 23 +++++++++++++---------- board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c | 14 ++++++++------ 2 files changed, 21 insertions(+), 16 deletions(-)

2 1

[PATCH 1/1] doc: update requirements.txt
by Heinrich Schuchardt 17 Jun '24

17 Jun '24

Update all required Python packages to current release. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/sphinx/requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt index 54eb70aa92c..306b05a995e 100644 --- a/doc/sphinx/requirements.txt +++ b/doc/sphinx/requirements.txt @@ -1,18 +1,18 @@ alabaster==0.7.16 -Babel==2.14.0 -certifi==2023.11.17 +Babel==2.15.0 +certifi==2024.6.2 charset-normalizer==3.3.2 docutils==0.20.1 idna==3.7 imagesize==1.4.1 Jinja2==3.1.4 -MarkupSafe==2.1.3 -packaging==23.2 -Pygments==2.17.2 -requests==2.32.2 +MarkupSafe==2.1.5 +packaging==24.1 +Pygments==2.18.0 +requests==2.32.3 six==1.16.0 snowballstemmer==2.2.0 -Sphinx==7.2.6 +Sphinx==7.3.7 sphinx-prompt==1.8.0 sphinx-rtd-theme==2.0.0 sphinxcontrib-applehelp==1.0.8 @@ -22,4 +22,4 @@ sphinxcontrib-jquery==4.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 -urllib3==2.1.0 +urllib3==2.2.1 -- 2.43.0

2 2

Re: [PATCH 2/6] board: freescale: p1_p2_rdb_pc: Add weak function p1_p2_rdb_pc_fix_fdt_model() for fixing DT model string
by Marek Mojík 17 Jun '24

17 Jun '24

On 6/7/24 1:32 AM, Sinan Akman wrote: > > On 2024-06-06 12:33 p.m., Marek Mojík wrote: >> From: Pali Rohár <pali(a)kernel.org> >> >> This allows boards to fixup / overwrite DT model string when booting OS. >> >> Signed-off-by: Pali Rohár <pali(a)kernel.org> >> Signed-off-by: Marek Mojík <marek.mojik(a)nic.cz> >> --- >> board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> index 399ff72072..336d274cdb 100644 >> --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> @@ -364,6 +364,8 @@ int board_early_init_r(void) >> return 0; >> } >> >> +__weak void p1_p2_rdb_pc_fix_fdt_model(void *blob) {} >> + >> #if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP) >> static void fix_max6370_watchdog(void *blob) >> { >> @@ -407,6 +409,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >> sizeof("okay"), 0); >> #endif >> >> + p1_p2_rdb_pc_fix_fdt_model(blob); >> fix_max6370_watchdog(blob); >> >> #if defined(CONFIG_HAS_FSL_DR_USB) >> @@ -464,6 +467,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >> #ifdef CONFIG_OF_BOARD_FIXUP >> int board_fix_fdt(void *blob) >> { >> + p1_p2_rdb_pc_fix_fdt_model(blob); >> fix_max6370_watchdog(blob); >> return 0; >> } > > > Hi Marek > > I have a P2020-RDB board and last time I tried to test ToT (couple > months ago) > > I needed to remove a watchdog patch that was added by Pali (a year+ ago). I > > believe because of the differences in CPLD that patch kept resetting on > my board. > > > I am traveling (again) but when I am back on July 10th I can give a try to > > test this if you prefer. > > > Best regards > > Sinan Akman > Hi Sinan, What do you mean by ToT? Regardless, I don't have access to P2020-RDB, so you will have to test it yourself. Best regards, Marek

2 1

[PATCH] xilinx: Enable NVMEM framework for all platforms
by Michal Simek 17 Jun '24

17 Jun '24

Boards which have for example MAC address in eeprom but not in Xilinx format (legacy or FRU) could reference it via nvmem cells. For example: &gem0 { nvmem-cells = <&mac>; nvmem-cell-names = "mac-address"; }; &eeprom { #address-cells = <1>; #size-cells = <1>; mac: mac-address@f0 { reg = <0xf0 6>; }; }; For getting it work above DT changes are required but also CONFIG_NVMEM should be enabled. That's why enable it by default in generic defconfigs to be able to use it directly by changing DT only. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- configs/xilinx_versal_net_virt_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 40c6a29a16e3..d9e2e050ceb6 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -80,6 +80,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_DM_MAILBOX=y CONFIG_ZYNQMP_IPI=y CONFIG_MISC=y +CONFIG_NVMEM=y CONFIG_I2C_EEPROM=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index c9b8a6de0133..95a671db363e 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -83,6 +83,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_DM_MAILBOX=y CONFIG_ZYNQMP_IPI=y CONFIG_MISC=y +CONFIG_NVMEM=y CONFIG_I2C_EEPROM=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 708cfe96b63b..e025256dc561 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -107,6 +107,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_NVMEM=y CONFIG_I2C_EEPROM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 18931cffbbd6..296adf066b10 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -147,6 +147,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_NVMEM=y CONFIG_I2C_EEPROM=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y -- 2.44.0

2 1

[PATCH] sandbox: cleanup linker scripts and sections
by Ilias Apalodimas 17 Jun '24

17 Jun '24

commit 6e2228fb052b ("Merge patch series "Clean up arm linker scripts"") was cleaning up linker scripts for armv7 and v8 in a similar fashion. Several commits in the past -- e.g commit d0b5d9da5de2 ("arm: make _end compiler-generated") was moving symbols to be compiler generated. They were defined as c variables in its own section to force the compiler emit relative a reference. However, defining those in the linker script will do the same thing since [0]. So let's remove the special sections from the linker scripts, the variable definitions from sections.c, and define them as a symbols. It's worth noting that the linker was discarding the symbols in the older binary completely. - new binary $~ aarch64-linux-gnu-readelf -sW u-boot | grep efi_runtim 246: 000000000004acbe 13 FUNC LOCAL DEFAULT 14 vbe_req_efi_runtime_rand 3198: 0000000000318690 16 OBJECT LOCAL DEFAULT 29 efi_runtime_mmio 6359: 00000000000dedff 217 FUNC LOCAL DEFAULT 14 efi_runtime_relocate 7942: 00000000003074c0 136 OBJECT GLOBAL HIDDEN 29 efi_runtime_services 8869: 0000000000305e20 0 NOTYPE GLOBAL DEFAULT 27 __efi_runtime_rel_stop 9159: 0000000000305e20 0 NOTYPE GLOBAL DEFAULT 27 __efi_runtime_stop 9410: 0000000000305e20 0 NOTYPE GLOBAL DEFAULT 27 __efi_runtime_start 10137: 00000000005981bd 0 NOTYPE WEAK HIDDEN 33 efi_runtime.c.de5bed54 10470: 0000000000305e20 0 NOTYPE GLOBAL DEFAULT 27 __efi_runtime_rel_start - old binary $~ aarch64-linux-gnu-readelf -sW u-boot.old | grep efi_runtim 246: 000000000004acbe 13 FUNC LOCAL DEFAULT 14 vbe_req_efi_runtime_rand 3198: 0000000000318690 16 OBJECT LOCAL DEFAULT 29 efi_runtime_mmio 6359: 00000000000dedff 221 FUNC LOCAL DEFAULT 14 efi_runtime_relocate 7942: 00000000003074c0 136 OBJECT GLOBAL HIDDEN 29 efi_runtime_services 10135: 0000000000598320 0 NOTYPE WEAK HIDDEN 33 efi_runtime.c.de5bed54 $~ bloat-o-meter u-bool.old u-boot add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-4 (3) Function old new delta efi_memory_init 343 350 +7 efi_runtime_relocate 221 217 -4 Total: Before=2009902, After=2009905, chg +0.00% [0] binutils commit 6b3b0ab89663 ("Make linker assigned symbol dynamic only for shared object") Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- arch/sandbox/cpu/u-boot.lds | 20 ++++---------------- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/sections.c | 13 ------------- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 arch/sandbox/lib/sections.c diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index 52f13af3742f..6ee8095b6cbb 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -19,30 +19,18 @@ SECTIONS *(_u_boot_sandbox_getopt_end) } - efi_runtime_start : { - *(___efi_runtime_start) - } - efi_runtime : { + __efi_runtime_start = .; *(efi_runtime_text) *(efi_runtime_data) - } - - efi_runtime_stop : { - *(___efi_runtime_stop) - } - - efi_runtime_rel_start : { - *(___efi_runtime_rel_start) + __efi_runtime_stop = .; } efi_runtime_rel : { + __efi_runtime_rel_start = .; *(.relefi_runtime_text) *(.relefi_runtime_data) - } - - efi_runtime_rel_stop : { - *(___efi_runtime_rel_stop) + __efi_runtime_rel_stop = .; } .dynsym : diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index a2bc5a7ee60f..d7d15a50bb6c 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -5,7 +5,7 @@ # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -obj-y += fdt_fixup.o interrupts.o sections.o +obj-y += fdt_fixup.o interrupts.o obj-$(CONFIG_PCI) += pci_io.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o diff --git a/arch/sandbox/lib/sections.c b/arch/sandbox/lib/sections.c deleted file mode 100644 index 2f2f3fbfdb86..000000000000 --- a/arch/sandbox/lib/sections.c +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2013 Albert ARIBAUD <albert.u.boot(a)aribaud.net> - * - */ -#include <linux/compiler.h> - -char __efi_runtime_start[0] __section("___efi_runtime_start"); -char __efi_runtime_stop[0] __section("___efi_runtime_stop"); -char __efi_runtime_rel_start[0] - __section("___efi_runtime_rel_start"); -char __efi_runtime_rel_stop[0] - __section("___efi_runtime_rel_stop"); -- 2.45.1

3 3

[PATCH v2 0/2] bootstd: Fix a handful of doc typos in bootmeth
by Mattijs Korpershoek 17 Jun '24

17 Jun '24

While working on bootflow, we noticed some wording inconsistencies with bootmeth versus bootmethod. According to [1], we should use bootmeth(s), not bootmethod(s): """ For version 2, a new naming scheme is used as above: - bootdev is used instead of bootdevice, because 'device' is overused, is everywhere in U-Boot, can be confused with udevice - bootmeth - because 'method' is too vanilla, appears 1300 times in U-Boot """ [1] c.f. https://lore.kernel.org/u-boot/20211023232635.9195-1-sjg@chromium.org/ First patch fixes some trivial typos, second patch replaces all occurences of bootmethod(s) -> bootmeth(s). Signed-off-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- Changes in v2: - Made into a series - New patch replaces all bootmethod(s) -> bootmeth(s) - Link to v1: https://lore.kernel.org/r/20240603-bootmeth-typos-v1-1-6edbdb469f7c@baylibr… --- Mattijs Korpershoek (2): bootstd: Fix a handful of doc typos in bootmeth bootstd: Replace bootmethod(s) -> bootmeth(s) board/sandbox/sandbox.env | 2 +- boot/bootmeth-uclass.c | 2 +- include/bootmeth.h | 42 +++++++++++++++++++++--------------------- include/extlinux.h | 2 +- test/boot/bootflow.c | 2 +- test/boot/bootmeth.c | 6 +++--- 6 files changed, 28 insertions(+), 28 deletions(-) --- base-commit: ea722aa5eb33740ae77e8816aeb72b385e621cd0 change-id: 20240603-bootmeth-typos-47c865e70ccf Best regards, -- Mattijs Korpershoek <mkorpershoek(a)baylibre.com>

6 12

[PATCH] xilinx: Enable FF-A for all our arm64 SoCs
by Michal Simek 17 Jun '24

17 Jun '24

Enable FFA_TRANSPORT which also enable FFA command. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- configs/amd_versal2_virt_defconfig | 1 + configs/xilinx_versal_net_virt_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynqmp_kria_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + 5 files changed, 5 insertions(+) diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index 6e4adddf2c02..2d611f84cd93 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -73,6 +73,7 @@ CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_CLK_CCF=y CONFIG_CLK_SCMI=y CONFIG_DFU_RAM=y +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_I2C_MUX=y diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index d9e2e050ceb6..c869450e119f 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -72,6 +72,7 @@ CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_CLK_VERSAL=y CONFIG_DFU_RAM=y +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_ZYNQ_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 95a671db363e..5dd5fb1c5477 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -74,6 +74,7 @@ CONFIG_CLK_VERSAL=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1800000 +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_VERSALPL=y CONFIG_DM_I2C=y diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index ba42f0c78485..69a5468f6fb0 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -134,6 +134,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_GPIO_HOG=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 9a71fce4c3c4..396bff927dd4 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -134,6 +134,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_GPIO_HOG=y -- 2.40.1

2 1

[PATCH] xilinx: versal-net: Add env redund offset
by Venkatesh Yadav Abbarapu 17 Jun '24

17 Jun '24

ENV_OFFSET_REDUND config is by default set to 0 for flashes. Saving the env variables is overwriting data at 0 offset, which is wrong. So add default redund env offset ENV_OFFSET_REDUND at 0x7F00000 for Versal NET platform. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- configs/xilinx_versal_net_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 40c6a29a16..289f27cdea 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-net-virt" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y +CONFIG_ENV_OFFSET_REDUND=0x7F00000 CONFIG_CMD_FRU=y CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_MEMTEST_START=0x00000000 -- 2.17.1

2 1

[PATCH] gpio: Add proper dependency on ZYNQMP_FIRMWARE
by Michal Simek 17 Jun '24

17 Jun '24

ZYNQMP_FIRMWARE can be disabled and driver depends on it that's why record this dependency via Kconfig. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b050585389bb..93c5125fed9b 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -639,7 +639,7 @@ config NOMADIK_GPIO config ZYNQMP_GPIO_MODEPIN bool "ZynqMP gpio modepin" - depends on DM_GPIO + depends on DM_GPIO && ZYNQMP_FIRMWARE help This config enables the ZynqMP gpio modepin driver. ZynqMP modepin driver will set and get the status of PS_MODE pins. These modepins -- 2.40.1

1 1

[PATCH] arm64: zynqmp: Align #address/size-cells with node
by Michal Simek 17 Jun '24

17 Jun '24

zynqmp-mini-nand wasn't aligned with dt binding that's why fix it. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-mini-nand.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/zynqmp-mini-nand.dts b/arch/arm/dts/zynqmp-mini-nand.dts index 5889d436edb8..e08a7840d8e1 100644 --- a/arch/arm/dts/zynqmp-mini-nand.dts +++ b/arch/arm/dts/zynqmp-mini-nand.dts @@ -46,8 +46,8 @@ status = "okay"; reg = <0x0 0xff100000 0x1000>; clock-names = "clk_sys", "clk_flash"; - #address-cells = <2>; - #size-cells = <1>; + #address-cells = <1>; + #size-cells = <0>; arasan,has-mdma; num-cs = <2>; nand@0 { -- 2.40.1

1 1

[PATCH v2] Makefile: Fix include directory for OF_UPSTREAM
by Patrick Barsanti 17 Jun '24

17 Jun '24

Always prioritizing u-boot includes causes problems when trying to migrate boards to OF_UPSTREAM that have different local devicetree files with respect to the upstream ones, if local DT headers are not dropped. At the same time if local and upstream files are the same, migrations can be, and have been, introduced without dropping local DT headers. This also causes problems whenever upstream DTS and DT headers are patched. For example, now migrating a board based on `imx6ul.dtsi` to OF_UPSTREAM breaks it, as there are some missing defines in a local DT header file (`imx6ul-clock.h`); the solution would be to drop it, which has not always been done in previous OF_UPSTREAM migration patches for other boards because most of the time the two are the same. This solution is also vulnerable to ABI breakage, although this has not yet happened since the introduction of OF_UPSTREAM support and is unlikely. Maintainers assure backwards compatibility for DT headers when syncing the upstream folder with the kernel. The problem is that, at the current state, all boards that have not dropped their local headers when migrating to OF_UPSTREAM will break once the upstream devicetrees are patched, for example, to use any newly added define which is not present in the local DT header file, even if those changes are backwards compatible. This patch fixes these problems by prioritizing upstream includes when `CONFIG_OF_UPSTREAM=y`, while keeping current prioritization when it is not. Also in case of ABI breakage in the kernel, keeping redundant header files (only until strictly necessary, e.g. until all boards including them have been migrated to OF_UPSTREAM) together with this selective prioritization of the include folder is a solution for keeping not-yet-migrated boards from breaking. Link: https://lore.kernel.org/u-boot/20240528084224.113385-1-patrick.barsanti@ama… Signed-off-by: Patrick Barsanti <patrick.barsanti(a)amarulasolutions.com> Tested-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- Changes in v2: - Reword and correct the commit message following the discussion with Sumit, per Michael's suggestion. Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile index 79b28c2d81..899ae664ca 100644 --- a/Makefile +++ b/Makefile @@ -826,6 +826,19 @@ KBUILD_HOSTCFLAGS += $(if $(CONFIG_TOOLS_DEBUG),-g) # Use UBOOTINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option +ifeq ($(CONFIG_OF_UPSTREAM),y) +UBOOTINCLUDE := \ + -I$(srctree)/dts/upstream/include \ + -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + $(if $(CONFIG_$(SPL_)SYS_THUMB_BUILD), \ + $(if $(CONFIG_HAS_THUMB2), \ + $(if $(CONFIG_CPU_V7M), \ + -I$(srctree)/arch/arm/thumb1/include), \ + -I$(srctree)/arch/arm/thumb1/include)) \ + -I$(srctree)/arch/$(ARCH)/include \ + -include $(srctree)/include/linux/kconfig.h +else UBOOTINCLUDE := \ -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ @@ -837,6 +850,7 @@ UBOOTINCLUDE := \ -I$(srctree)/arch/$(ARCH)/include \ -include $(srctree)/include/linux/kconfig.h \ -I$(srctree)/dts/upstream/include +endif NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) -- 2.45.1

6 10