December 2022 - U-Boot

[PATCH 1/1] Kconfig: clean up skipping low-level initialization
by Heinrich Schuchardt 30 Dec '22

30 Dec '22

It is confusing if multiple Kconfig entries have the same title. Use different titles for main U-Boot, SPL, TPL. Put all entries for skipping low-level initialization into a sub-menu. Fixes: a2ac2b964bfb ("Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/Kconfig | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 102956d24c..112dcfe00f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -381,9 +381,11 @@ config SYS_IMMR Address for the Internal Memory-Mapped Registers (IMMR) window used to configure the features of many Freescale / NXP SoCs. -config SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" +menu "Skipping low level initialization functions" depends on ARM || MIPS || RISCV + +config SKIP_LOWLEVEL_INIT + bool "Skip calls to certain low level initialization functions" help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate @@ -393,8 +395,8 @@ config SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config SPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" - depends on SPL && (ARM || MIPS || RISCV) + bool "Skip SPL calls to certain low level initialization functions" + depends on SPL help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate @@ -404,7 +406,7 @@ config SPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config TPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" + bool "Skip TPL calls to certain low level initialization functions" depends on SPL && ARM help If enabled, then certain low level initializations (like setting up @@ -415,7 +417,7 @@ config TPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip call to lowlevel_init during early boot ONLY" depends on ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -423,7 +425,7 @@ config SKIP_LOWLEVEL_INIT_ONLY performed. config SPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip SPL call to lowlevel_init during early boot ONLY" depends on SPL && ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -431,13 +433,15 @@ config SPL_SKIP_LOWLEVEL_INIT_ONLY performed. config TPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip TPL call to lowlevel_init during early boot ONLY" depends on TPL && ARM help This allows just the call to lowlevel_init() to be skipped. The normal CP15 init (such as enabling the instruction cache) is still performed. +endmenu + config SYS_HAS_NONCACHED_MEMORY bool "Enable reserving a non-cached memory area for drivers" depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH) -- 2.37.2

3 2

CONFIG migration quirk
by Simon Glass 30 Dec '22

30 Dec '22

Hi Tom, If I: 1. Revert 9ef3ba85bf3 kbuild: Remove checking for adhoc CONFIG symbols 2. rm scripts/config_whitelist.txt 3. run ./scripts/build-whitelist.sh Then I get about 930 unmirgrated CONFIG options: $ wc scripts/config_whitelist.txt 930 930 21243 scripts/config_whitelist.txt It seems that some of them are still there. I noticed this when looking at CONFIG_VIDEO_FONT_4X6 Am I missing something? Regards, Simon

2 3

[PATCH v1 1/1] arm64: versal: enable config_of_separate
by Neal Frager 29 Dec '22

29 Dec '22

Enable CONFIG_OF_SEPARATE, so that the u-boot.dtb is built by default for versal devices. Signed-off-by: Neal Frager <neal.frager(a)amd.com> --- configs/xilinx_versal_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index de74b70550..1a254297f3 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -53,6 +53,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_OF_BOARD=y +CONFIG_OF_SEPARATE=y CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_SPI_FLASH=y -- 2.17.1

2 1

[PATCH] CI: Rework rockchip jobs in Azure
by Tom Rini 29 Dec '22

29 Dec '22

The rockchip job is getting close to the hard time limit in Azure for the free tier. Split this in to 32bit and 64bit board jobs. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 21213369c6c5..ca29479745e6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -535,8 +535,10 @@ stages: BUILDMAN: "uniphier" aarch64_catch_all: BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq" - rockchip: - BUILDMAN: "rk" + rockchip_32bit: + BUILDMAN: "rk -x aarch64" + rockchip_64bit: + BUILDMAN: "rk&aarch64" renesas: BUILDMAN: "renesas" zynq: -- 2.25.1

2 2

[PATCH 1/2] net: wget: fix implicit declaration
by Michael Walle 29 Dec '22

29 Dec '22

The compiler complains about the missing declaration of print_size(): net/wget.c:415:3: warning: implicit declaration of function ‘print_size’ [-Wimplicit-function-declaration] Fix it. Signed-off-by: Michael Walle <michael(a)walle.cc> --- net/wget.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/wget.c b/net/wget.c index 3826c4b364..eebdf80eb5 100644 --- a/net/wget.c +++ b/net/wget.c @@ -6,6 +6,7 @@ #include <command.h> #include <common.h> +#include <display_options.h> #include <env.h> #include <image.h> #include <mapmem.h> -- 2.30.2

3 5

Broken commit de47ff536363289f92f85ed1e4901724d238432d
by Pali Rohár 29 Dec '22

29 Dec '22

Hello Tom! Your commit de47ff536363289f92f85ed1e4901724d238432d ("Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to Kconfig") seems to be broken. If you look at P1020RDB-PD_defconfig file change in this commit there is: --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -9,6 +9,7 @@ CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y Which does not make sense to me. First thing is that CONFIG_MPC85XX_HAVE_RESET_VECTOR and CONFIG_SYS_MPC85XX_NO_RESETVEC are exclusive options. You can either disable generating of reset vector in image or enable it. What is expected from the result when you ask Kconfig to both enable and disable it? First specified option win? Or last specified win? Or random of those two options win? It is not really clear for me. Second thing is that reset vector is required for (parallel) NOR booting and your change is adding CONFIG_SYS_MPC85XX_NO_RESETVEC=y to defconfig for NOR, which to my guess make image non-bootable and broken. And seems that other defconfig files in that change have similar issues.

4 50

sandbox: "Reset Status: WARM Reset Status: COLD"
by Heinrich Schuchardt 29 Dec '22

29 Dec '22

Hello Simon, the sandbox prints the following line when started: "Reset Status: WARM Reset Status: COLD" This does not make much sense. Either the last reset was WARM or COLD but not both. sandbox_sysreset_get_status() and sandbox_warm_sysreset_get_status() should determine the reset status before printing anything incorrect. After executing the reset command state->last_sysreset == 4 This cannot be correct. It seems to be due to: arch/sandbox/cpu/state.c:365: state->last_sysreset = SYSRESET_COUNT; state_reset_for_test() should only be called in tests. Best regards Heinrich

2 1

[PATCH] PowerPC: Update dependencies on *SYS_MPC85XX_NO_RESETVEC
by Tom Rini 29 Dec '22

29 Dec '22

In 96699f097a02 ("powerpc: mpc85xx: Use binman to embed dtb inside U-Boot") we introduce CONFIG_MPC85XX_HAVE_RESET_VECTOR and do so via Kconfig. However, much later in de47ff536363 ("Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to Kconfig") I converted the symbol that is the inverse of this to Kconfig. This should have included a dependency on the first symbol as they are logically opposite. The dependency being missing lead to some platforms being broken at runtime due to discarding the require reset vector. Fixes: de47ff536363 ("Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to Kconfig") Reported-by: Pali Rohár <pali(a)kernel.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/powerpc/cpu/mpc85xx/Kconfig | 6 +++--- configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 - configs/P1010RDB-PA_NOR_defconfig | 1 - configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 - configs/P1010RDB-PB_NOR_defconfig | 1 - configs/P1020RDB-PC_36BIT_defconfig | 1 - configs/P1020RDB-PC_defconfig | 1 - configs/P1020RDB-PD_defconfig | 1 - configs/P2020RDB-PC_36BIT_defconfig | 1 - configs/P2020RDB-PC_defconfig | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 24d3f1f20c25..9d12bf168d95 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -1459,14 +1459,14 @@ config SYS_FSL_USB_DUAL_PHY_ENABLE config SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up" - depends on MPC85xx + depends on MPC85xx && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section. config SPL_SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up, in SPL" - depends on MPC85xx && SPL + depends on MPC85xx && SPL && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section, @@ -1474,7 +1474,7 @@ config SPL_SYS_MPC85XX_NO_RESETVEC config TPL_SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up, in TPL" - depends on MPC85xx && TPL + depends on MPC85xx && TPL && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section, diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index dcf74f5d6af5..42f736350a40 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index 537d8bf576b0..587defcc79d8 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 92a7e0966936..b772edf305b0 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 3e16470608e5..10ab2c04d660 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index ce0ba0e37574..368fc79d50c5 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index aae886b75c4e..764ff06a47ca 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 5fecb6684735..b3547d74e647 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PD=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index b1dbca6e7ea3..a6b74636b9f1 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 1ee46f9fbe9f..3362532782f0 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 -- 2.25.1

2 2

[PATCH] PowerPC: Rework PBL location choice
by Tom Rini 29 Dec '22

29 Dec '22

When converting CONFIG_SDCARD and CONFIG_SPIFLASH to Kconfig, one set of uses wasn't converted correctly. Allow for the case where platforms don't rely on "PBL" to boot but instead use other mechanisms. See the link below for more details. Link: https://lore.kernel.org/all/20220802091338.f4g45ldhc7qbg6hm@pali/ Fixes: d433c74eecdc ("Convert CONFIG_SDCARD et al to Kconfig") Tested-by: Pali Rohár <pali(a)kernel.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- boot/Kconfig | 9 ++++++--- configs/P1010RDB-PA_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PA_NOR_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PB_NOR_defconfig | 2 +- configs/P1020RDB-PC_36BIT_defconfig | 2 +- configs/P1020RDB-PC_defconfig | 2 +- configs/P1020RDB-PD_defconfig | 2 +- configs/P2020RDB-PC_36BIT_defconfig | 2 +- configs/P2020RDB-PC_defconfig | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 4a001bcee851..424ad0e466da 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -724,16 +724,19 @@ config RAMBOOT_PBL For more details refer to doc/README.pblimage choice - prompt "Freescale PBL load location" + prompt "Freescale PBL (or predecessor) load location" depends on RAMBOOT_PBL || ((TARGET_P1010RDB_PA || TARGET_P1010RDB_PB \ || TARGET_P1020RDB_PC || TARGET_P1020RDB_PD || TARGET_P2020RDB) \ && !CMD_NAND) config SDCARD - bool "Freescale PBL is found on SD card" + bool "Freescale PBL (or similar) is found on SD card" config SPIFLASH - bool "Freescale PBL is found on SPI flash" + bool "Freescale PBL (or similar) is found on SPI flash" + +config NO_PBL + bool "Freescale PBL (or similar) is not used in this case" endchoice diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index dcf74f5d6af5..deff04bf881d 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -19,7 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index 537d8bf576b0..98486a0ae2ff 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 92a7e0966936..41a1a852b986 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -19,7 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 3e16470608e5..16c076bc9aaa 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index ce0ba0e37574..e60c92cedae9 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -21,7 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index aae886b75c4e..f0f0eee65d29 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 5fecb6684735..8b7f9310b1a4 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index b1dbca6e7ea3..1640f2379863 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -21,7 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 1ee46f9fbe9f..ca9f44728845 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" -- 2.25.1

1 1

Pull request for efi-2023-01-rc5-2
by Heinrich Schuchardt 29 Dec '22

29 Dec '22

The following changes since commit adcee0791f3318ead9b22879e2ce9409f400dcab: Merge https://source.denx.de/u-boot/custodians/u-boot-pmic (2022-12-26 21:00:20 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-01-rc5-2 for you to fetch changes up to f557cf08b974c359ad3c53a87297d19fe13ff4f0: efi_loader: use u16_strlen() in efi_var_mem_ins() (2022-12-29 12:52:39 +0100) ---------------------------------------------------------------- Pull request for efi-2023-01-rc5-2 Documentation: * Reorganize existing TI docs and add K3 generation page * Add texinfodocs and infodocs targets * Update qemu-ppce500 documentation * Use "changesets" not "csets" in statistics pages UEFI * Fix merging of preseeded non-volatile variables * Fix a return value in the EFI_HII_DATABASE_PROTOCOL * Set UEFI specification version to 2.10 ---------------------------------------------------------------- Bryan Brattlof (2): doc: ti: reorganize existing ti docs doc: ti: add the K3 generation page Heinrich Schuchardt (5): doc: improve wget man-page efi_loader: set IMAGE_FILE_LARGE_ADDRESS_AWARE efi_loader: set UEFI specification version to 2.10 efi_loader: typo non-volatile in efi_var_restore efi_loader: use u16_strlen() in efi_var_mem_ins() Ilias Apalodimas (1): efi_loader: avoid adding variables twice Maxim Cournoyer (1): doc: add texinfodocs and infodocs targets Pali Rohár (1): doc: board: qemu-ppce500: Update supported and unsupported Tom Rini (1): doc: Use "changesets" not "csets" in statistics pages Vincent Stehlé (1): efi_loader: fix get_package_list_handle() status Makefile | 2 +- arch/arm/lib/crt0_aarch64_efi.S | 1 + arch/riscv/lib/crt0_riscv_efi.S | 17 +- doc/Makefile | 10 + doc/board/emulation/qemu-ppce500.rst | 8 +- doc/board/ti/am335x_evm.rst | 5 +- doc/board/ti/am62x_sk.rst | 4 +- doc/board/ti/index.rst | 5 +- doc/board/ti/j721e_evm.rst | 4 +- doc/board/ti/k3.rst | 274 +++++++++++++++++++++++ doc/conf.py | 6 +- doc/develop/statistics/u-boot-stats-v1.3.0.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.1.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.2.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.3.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.4.rst | 2 +- doc/develop/statistics/u-boot-stats-v2008.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.08.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.12.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.12.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2013.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2013.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.10.rst | 2 +- doc/media/Makefile | 3 +- doc/usage/cmd/wget.rst | 5 +- include/efi_api.h | 2 +- lib/efi_loader/efi_hii.c | 2 +- lib/efi_loader/efi_var_file.c | 4 +- lib/efi_loader/efi_var_mem.c | 4 +- lib/efi_loader/efi_variable.c | 6 +- 84 files changed, 396 insertions(+), 98 deletions(-) create mode 100644 doc/board/ti/k3.rst

2 1