Convert CFG_SYS_UBOOT_START to Kconfig
Subsystems (6)
PATCH v2 1/1 Convert CFG_SYS_UBOOT_START to Kconfig
Commit 65cc0e2a65d2 ("global: Move remaining CONFIG_SYS_* to CFG_SYS_*") renamed CONFIG_SYS_UBOOT_START to CFG_SYS_UBOOT_START. Unfortunately, this meant that the value was no longer available to the Makefile. This caused imxrt to fail to boot. All the other boards that used this variable were unaffected because they were using the default value which is CONFIG_TEXT_BASE.
This commit converts CFG_SYS_UBOOT_START to Kconfig and sets the default value to CONFIG_TEXT_BASE.
---V1->V2:
- Add "and executed" to TEXT_BASE
- Reword SYS_UBOOT_START
- Reword HAVE_SYS_UBOOT_START
- Use bool as prompt
--- Makefile | 16 ++++------------ arch/arm/mach-k3/config_secure.mk | 2 +- arch/arm/mach-omap2/config_secure.mk | 2 +- boot/Kconfig | 19 ++++++++++++++++++- common/spl/spl.c | 6 +----- common/spl/spl_fit.c | 2 +- configs/imxrt1020-evk_defconfig | 2 ++ configs/imxrt1050-evk_defconfig | 2 ++ configs/imxrt1170-evk_defconfig | 2 ++ .../configs/gardena-smart-gateway-mt7688.h | 4 ---- include/configs/imxrt1020-evk.h | 6 ------ include/configs/imxrt1050-evk.h | 6 ------ include/configs/imxrt1170-evk.h | 3 --- include/configs/linkit-smart-7688.h | 4 ---- include/configs/mt7620.h | 3 --- include/configs/mt7628.h | 3 --- include/configs/mt8512.h | 2 -- include/configs/vocore2.h | 4 ---- include/spl.h | 2 +- 19 files changed, 33 insertions(+), 57 deletions(-)
Makefile +4 -12
@@ -1364,14 +1364,6 @@ OBJCOPYFLAGS_u-boot.ldr.srec := -I binary -O srec u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE $(call if_changed,objcopy) -# -# U-Boot entry point, needed for booting of full-blown U-Boot -# from the SPL U-Boot version. -# -ifndef CFG_SYS_UBOOT_START -CFG_SYS_UBOOT_START := $(CONFIG_TEXT_BASE) -endif - # Boards with more complex image requirements can provide an .its source file # or a generator script # NOTE: Please do not use this. We are migrating away from Makefile rules to use
@@ -1391,7 +1383,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(DEVICE_TREE))) \
@@ -1399,10 +1391,10 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST))) else MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" MKIMAGEFLAGS_u-boot-ivt.img = -A $(ARCH) -T firmware_ivt -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" u-boot-ivt.img: MKIMAGEOUTPUT = u-boot-ivt.img.log endif
@@ -1433,7 +1425,7 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ UBOOT_BIN := u-boot.bin MKIMAGEFLAGS_u-boot-lzma.img = -A $(ARCH) -T standalone -C lzma -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" u-boot.bin.lzma: u-boot.bin FORCE
arch/arm/mach-k3/config_secure.mk +1 -1
@@ -30,7 +30,7 @@ tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$( $(call if_changed,mkfitimage) MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST)))
arch/arm/mach-omap2/config_secure.mk +1 -1
@@ -102,7 +102,7 @@ u-boot_HS_XIP_X-LOADER: $(obj)/u-boot.bin FORCE ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot_HS.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CFG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST)))
boot/Kconfig +18 -1
@@ -738,7 +738,24 @@ config TEXT_BASE default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 hex "Text Base" help - The address in memory that U-Boot will be running from, initially. + The address in memory that U-Boot will be copied and executed from initially. + +config HAVE_SYS_UBOOT_START + bool "Use custom U-Boot Start" + depends on HAVE_TEXT_BASE + help + By default, the address in memory that U-Boot will be copied from (TEXT_BASE) and the + entry point are the same. Select this to start the execution of U-Boot from a different address. + This may be required if a header or vector table needs to be copied but not executed. + +config SYS_UBOOT_START + hex + depends on HAVE_TEXT_BASE + default TEXT_BASE + prompt "U-Boot entry" if HAVE_SYS_UBOOT_START + help + If TEXT_BASE differs from the start of execution, this sets the address in memory that + U-Boot will start execution from initially. config HAVE_SYS_MONITOR_BASE bool
common/spl/spl.c +1 -5
@@ -45,10 +45,6 @@DECLARE_GLOBAL_DATA_PTR ;DECLARE_BINMAN_MAGIC_SYM ; -#ifndef CFG_SYS_UBOOT_START -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -#endif -u32 *boot_params_ptr =NULL ;#if CONFIG_IS_ENABLED (BINMAN_UBOOT_SYMBOLS )
@@ -252,7 +248,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->entry_point = u_boot_pos; spl_image->load_addr = u_boot_pos; }else { - spl_image->entry_point =CFG_SYS_UBOOT_START ; + spl_image->entry_point =CONFIG_SYS_UBOOT_START ; spl_image->load_addr =CONFIG_TEXT_BASE ; } spl_image->os =IH_OS_U_BOOT ;
common/spl/spl_fit.c +1 -1
@@ -816,7 +816,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, }/* -* If a platform does not provide CFG_SYS_UBOOT_START, U-Boot's +* If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's * Makefile will set it to 0 and it will end up as the entry point * here. What it actually means is: use the load address. */
configs/imxrt1020-evk_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_SIZE_LIMIT=0x20000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x20209000 +CONFIG_HAVE_SYS_UBOOT_START=y +CONFIG_SYS_UBOOT_START=0x800023FD CONFIG_DISTRO_DEFAULTS=y CONFIG_SD_BOOT=y # CONFIG_USE_BOOTCOMMAND is not set
configs/imxrt1050-evk_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_SIZE_LIMIT=0x20000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x20209000 +CONFIG_HAVE_SYS_UBOOT_START=y +CONFIG_SYS_UBOOT_START=0x800023FD CONFIG_DISTRO_DEFAULTS=y CONFIG_SD_BOOT=y # CONFIG_USE_BOOTCOMMAND is not set
configs/imxrt1170-evk_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_SIZE_LIMIT=0x20000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x202C0000 +CONFIG_HAVE_SYS_UBOOT_START=y +CONFIG_SYS_UBOOT_START=0x202403FD CONFIG_DISTRO_DEFAULTS=y CONFIG_SD_BOOT=y # CONFIG_USE_BOOTCOMMAND is not set
include/configs/gardena-smart-gateway-mt7688.h +0 -4
@@ -11,10 +11,6 @@#define CFG_SYS_INIT_SP_OFFSET 0x400000 -/* SPL */ - -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -/* Dummy value */ #define CFG_SYS_UBOOT_BASE 0
include/configs/imxrt1020-evk.h +0 -6
@@ -18,10 +18,4 @@#define DMAMEM_BASE (PHYS_SDRAM + PHYS_SDRAM_SIZE - \ DMAMEM_SZ_ALL) -/* -* Configuration of the external SDRAM memory -*/ - -#define CFG_SYS_UBOOT_START 0x800023FD -#endif /* __IMXRT1020_EVK_H */
include/configs/imxrt1050-evk.h +0 -6
@@ -25,10 +25,4 @@ "stderr=serial,vidconsole\0"#endif -/* -* Configuration of the external SDRAM memory -*/ - -#define CFG_SYS_UBOOT_START 0x800023FD -#endif /* __IMXRT1050_EVK_H */
include/configs/imxrt1170-evk.h +0 -3
@@ -22,8 +22,5 @@#define DMAMEM_SZ_ALL (1 * 1024 * 1024)#define DMAMEM_BASE (PHYS_SDRAM + PHYS_SDRAM_SIZE - \ DMAMEM_SZ_ALL) -/* For SPL */ -#define CFG_SYS_UBOOT_START 0x202403FD -/* For SPL ends */ #endif /* __IMXRT1170_EVK_H */
include/configs/linkit-smart-7688.h +0 -4
@@ -11,10 +11,6 @@#define CFG_SYS_INIT_SP_OFFSET 0x400000 -/* SPL */ - -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -/* Dummy value */ #define CFG_SYS_UBOOT_BASE 0
include/configs/mt7620.h +0 -3
@@ -12,9 +12,6 @@#define CFG_SYS_INIT_SP_OFFSET 0x400000 -/* SPL */ -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -/* Dummy value */ #define CFG_SYS_UBOOT_BASE 0
include/configs/mt7628.h +0 -3
@@ -22,9 +22,6 @@#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ 230400, 460800, 921600 } -/* SPL */ -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -/* Dummy value */ #define CFG_SYS_UBOOT_BASE 0
include/configs/mt8512.h +0 -2
@@ -10,8 +10,6 @@#define __MT8512_H/* Uboot definition */ -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -#define ENV_BOOT_READ_IMAGE \ "boot_rd_img=mmc dev 0" \ ";mmc read ${loadaddr} 0x27000 0x8000" \
include/configs/vocore2.h +0 -4
@@ -11,10 +11,6 @@#define CFG_SYS_INIT_SP_OFFSET 0x400000 -/* SPL */ - -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -/* Dummy value */ #define CFG_SYS_UBOOT_BASE 0
include/spl.h +1 -1
@@ -484,7 +484,7 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,* spl_set_header_raw_uboot() - Set up a standard SPL image structure * * This sets up the given spl_image which the standard values obtained from -* config options: CONFIG_SYS_MONITOR_LEN, CFG_SYS_UBOOT_START, +* config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START, * CONFIG_TEXT_BASE. * * @spl_image: Image description to set up
Signature · 1 line
2.40.0
Quoted 13 lines · Jesse Taube
Commit
65cc0e2a65d2("global: Move remaining CONFIG_SYS_* to CFG_SYS_*") renamedCONFIG_SYS_UBOOT_STARTtoCFG_SYS_UBOOT_START. Unfortunately, this meant that the value was no longer available to theMakefile. This caused imxrt to fail to boot. All the other boards that used this variable were unaffected because they were using the default value which isCONFIG_TEXT_BASE.This commit converts
CFG_SYS_UBOOT_STARTtoKconfigand sets the default value toCONFIG_TEXT_BASE.Suggested-by Marek Vasut <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Jesse Taube <[email protected]>
[snip]
Quoted 17 lines
boot/Kconfig +8
-1@@ -738,7 +738,24 @@ config TEXT_BASE default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 hex "Text Base" help - The address in memory that U-Boot will be running from, initially. + The address in memory that U-Boot will be copied and executed from initially. + +config HAVE_SYS_UBOOT_START + bool "Use custom U-Boot Start" + depends on HAVE_TEXT_BASE + help + By default, the address in memory that U-Boot will be copied from (TEXT_BASE) and the + entry point are the same. Select this to start the execution of U-Boot from a different address.
boot/Kconfig config TEXT_BASE · line 758
Quoted 10 lines
boot/Kconfig +10
-0+ This may be required if a header or vector table needs to be copied but not executed. + +config SYS_UBOOT_START + hex + depends on HAVE_TEXT_BASE + default TEXT_BASE + prompt "U-Boot entry" if HAVE_SYS_UBOOT_START + help + If TEXT_BASE differs from the start of execution, this sets the address in memory that + U-Boot will start execution from initially.
A small point, these help texts should wrap at 80 columns. If there's no other feedback I'll just fix that up when applying unless you want to.
Signature · 1 line
Tom
Simon Glass
Reviewed-byQuoted 17 lines · Tom Rini
Quoted 13 lines · Jesse Taube
Commit
65cc0e2a65d2("global: Move remaining CONFIG_SYS_* to CFG_SYS_*") renamedCONFIG_SYS_UBOOT_STARTtoCFG_SYS_UBOOT_START. Unfortunately, this meant that the value was no longer available to theMakefile. This caused imxrt to fail to boot. All the other boards that used this variable were unaffected because they were using the default value which isCONFIG_TEXT_BASE.This commit converts
CFG_SYS_UBOOT_STARTtoKconfigand sets the default value toCONFIG_TEXT_BASE.Suggested-by Marek Vasut <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Jesse Taube <[email protected]>[snip]
Quoted 13 lines
boot/Kconfig config TEXT_BASE · line 744
Quoted 13 lines
boot/Kconfig +4
-1@@ -738,7 +738,24 @@ config TEXT_BASE default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 hex "Text Base" help - The address in memory that U-Boot will be running from, initially. + The address in memory that U-Boot will be copied and executed from initially. + +config HAVE_SYS_UBOOT_START + bool "Use custom U-Boot Start"
start ?
Quoted 5 lines
boot/Kconfig config TEXT_BASE · line 749
Quoted 5 lines
boot/Kconfig +5
-0+ depends on HAVE_TEXT_BASE + help + By default, the address in memory that U-Boot will be copied from (TEXT_BASE) and the + entry point are the same. Select this to start the execution of U-Boot from a different address. + This may be required if a header or vector table needs to be copied but not executed.
Nice help!
Quoted 14 lines
boot/Kconfig config TEXT_BASE · line 758
Quoted 9 lines
boot/Kconfig +9
-0+ +config SYS_UBOOT_START + hex + depends on HAVE_TEXT_BASE + default TEXT_BASE + prompt "U-Boot entry" if HAVE_SYS_UBOOT_START + help + If TEXT_BASE differs from the start of execution, this sets the address in memory that + U-Boot will start execution from initially.A small point, these help texts should wrap at 80 columns. If there's no other feedback I'll just fix that up when applying unless you want to.
Quoted 1 line
Reviewed-by Tom Rini <[email protected]>
Yes please
Quoted 19 lines · Simon Glass
Quoted 17 lines · Tom Rini
Quoted 13 lines · Jesse Taube
Commit
65cc0e2a65d2("global: Move remaining CONFIG_SYS_* to CFG_SYS_*") renamedCONFIG_SYS_UBOOT_STARTtoCFG_SYS_UBOOT_START. Unfortunately, this meant that the value was no longer available to theMakefile. This caused imxrt to fail to boot. All the other boards that used this variable were unaffected because they were using the default value which isCONFIG_TEXT_BASE.This commit converts
CFG_SYS_UBOOT_STARTtoKconfigand sets the default value toCONFIG_TEXT_BASE.Suggested-by Marek Vasut <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Jesse Taube <[email protected]>[snip]
Quoted 15 lines
Quoted 5 lines
Quoted 5 lines
boot/Kconfig +0
-0@@ -738,7 +738,24 @@ config TEXT_BASEQuoted 8 lines
boot/Kconfig config TEXT_BASE · line 744
Quoted 8 lines
boot/Kconfig +4
-1default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 hex "Text Base" help - The address in memory that U-Boot will be running from, initially. + The address in memory that U-Boot will be copied and executed from initially. + +config HAVE_SYS_UBOOT_START + bool "Use custom U-Boot Start"start ?
This was the original name I did not change it. Uncapitalizing start, or changing it to "U-Boot entry" is fine if that's what you were asking
Quoted 22 lines
Quoted 6 lines
boot/Kconfig config TEXT_BASE · line 749
Quoted 6 lines
boot/Kconfig +5
-0+ depends on HAVE_TEXT_BASE + help + By default, the address in memory that U-Boot will be copied from (TEXT_BASE) and the + entry point are the same. Select this to start the execution of U-Boot from a different address. + This may be required if a header or vector table needs to be copied but not executed.Nice help!
Quoted 13 lines
boot/Kconfig config TEXT_BASE · line 758
Quoted 9 lines
boot/Kconfig +9
-0+ +config SYS_UBOOT_START + hex + depends on HAVE_TEXT_BASE + default TEXT_BASE + prompt "U-Boot entry" if HAVE_SYS_UBOOT_START + help + If TEXT_BASE differs from the start of execution, this sets the address in memory that + U-Boot will start execution from initially.A small point, these help texts should wrap at 80 columns. If there's no other feedback I'll just fix that up when applying unless you want to.
Oops, it's faster if you wrap to 80 columns.
Thanks,
Jesse Taube
Quoted 6 lines
Quoted 2 lines
Reviewed-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>Yes please
Quoted 7 lines · Jesse Taube
Commit
65cc0e2a65d2("global: Move remaining CONFIG_SYS_* to CFG_SYS_*") renamedCONFIG_SYS_UBOOT_STARTtoCFG_SYS_UBOOT_START. Unfortunately, this meant that the value was no longer available to theMakefile. This caused imxrt to fail to boot. All the other boards that used this variable were unaffected because they were using the default value which isCONFIG_TEXT_BASE.
Quoted 8 lines
This commit converts
CFG_SYS_UBOOT_STARTtoKconfigand sets the default value toCONFIG_TEXT_BASE.Suggested-by Marek Vasut <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Jesse Taube <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom