Fix CONFIG_SYS_UBOOT_START default value
Subsystems (5)
cover Fix CONFIG_SYS_UBOOT_START default value
This series fixes a regression introduced byd3e97b53c1f2 ("spl: fix entry_point equal to load_addr") which breaks some board boot (at least STM32MP15 in basic configuration)
If CONFIG_SYS_UBOOT_START is not set, it's set to CONFIG_SYS_TEXT_BASE by default.
This allows also to clean include/configs board files in which CONFIG_SYS_UBOOT_START is already set to CONFIG_SYS_TEXT_BASE.
Patrice Chotard (2):
Makefile: Fix CONFIG_SYS_UBOOT_START default value
treewide: Remove CONFIG_SYS_UBOOT_START from configs board files
Makefile | 2 +- include/configs/gardena-smart-gateway-at91sam.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/mccmon6.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mt7623.h | 1 - include/configs/mt7629.h | 1 - include/configs/mt8518.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/pumpkin.h | 1 - include/configs/tegra-common.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/zynq-common.h | 2 -- 14 files changed, 1 insertion(+), 17 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 Makefile: Fix CONFIG_SYS_UBOOT_START default value
This patches restores boot on boards which rely on CONFIG_SYS_UBOOT_START equal to CONFIG_SYS_TEXT_BASE when using SPL
---
Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -1265,7 +1265,7 @@ u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE # from the SPL U-Boot version. # ifndef CONFIG_SYS_UBOOT_START -CONFIG_SYS_UBOOT_START := 0 +CONFIG_SYS_UBOOT_START := $(CONFIG_SYS_TEXT_BASE) endif # Boards with more complex image requirements can provide an .its source file
Signature · 1 line
2.17.1
PATCH 1/2 Makefile: Fix CONFIG_SYS_UBOOT_START default value
Quoted 11 lines · Patrice Chotard
This patches restores boot on boards which rely on
CONFIG_SYS_UBOOT_STARTequal toCONFIG_SYS_TEXT_BASEwhen using SPLFixes d3e97b53c1f2 ("spl: fix entry_point equal to load_addr")Signed-off-by Patrice Chotard <[email protected]>---
Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 1/2 Makefile: Fix CONFIG_SYS_UBOOT_START default value
In reply to Patrice ChotardQuoted 7 lines · Patrice Chotard
This patches restores boot on boards which rely on
CONFIG_SYS_UBOOT_STARTequal toCONFIG_SYS_TEXT_BASEwhen using SPLFixes d3e97b53c1f2 ("spl: fix entry_point equal to load_addr")Signed-off-by Patrice Chotard <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200108/ecba36af/attachment.sig>
PATCH 2/2 treewide: Remove CONFIG_SYS_UBOOT_START from configs board files
In reply to Patrice ChotardAs previous CONFIG_SYS_UBOOT_START is now set by default to CONFIG_SYS_TEXT_BASE when not defined, CONFIG_SYS_UBOOT_START can be removed from include/configs board files.
---
include/configs/gardena-smart-gateway-at91sam.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/mccmon6.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mt7623.h | 1 - include/configs/mt7629.h | 1 - include/configs/mt8518.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/pumpkin.h | 1 - include/configs/tegra-common.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/zynq-common.h | 2 -- 13 files changed, 16 deletions(-)
include/configs/gardena-smart-gateway-at91sam.h +0 -1
@@ -64,7 +64,6 @@#define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000#define CONFIG_SYS_NAND_U_BOOT_SIZE 0xa0000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE
include/configs/ls1046a_common.h +0 -1
@@ -98,7 +98,6 @@ CONFIG_SPL_BSS_MAX_SIZE)#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000#define CONFIG_SYS_MONITOR_LEN 0x100000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#endif /* NAND SPL */
include/configs/mccmon6.h +0 -1
@@ -12,7 +12,6 @@#define CONFIG_SPL_LIBCOMMON_SUPPORT #include "imx6_spl.h" -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
include/configs/microblaze-generic.h +0 -2
@@ -173,8 +173,6 @@/* Just for sure that there is a space for stack */ #define CONFIG_SPL_STACK_SIZE 0x100 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_INIT_RAM_SIZE - \ CONFIG_SYS_INIT_RAM_ADDR - \ CONFIG_SYS_MALLOC_F_LEN - \
include/configs/mt7623.h +0 -1
@@ -31,7 +31,6 @@#define CONFIG_ENV_OVERWRITE /* Preloader -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)
include/configs/mt7629.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)/* SPL -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)
include/configs/mt8518.h +0 -1
@@ -29,7 +29,6 @@#define CONFIG_SYS_BOOTM_LEN SZ_64M/* Uboot definition */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + \ SZ_2M - \ GENERATED_GBL_DATA_SIZE)
include/configs/omap3_cairo.h +0 -1
@@ -26,7 +26,6 @@* other needs. We use this rather than the inherited defines from * ti_armv7_common.h for backwards compatibility. */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SPL_BSS_START_ADDR 0x80000000#define CONFIG_SPL_BSS_MAX_SIZE (512 << 10)/* 512 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x80208000
include/configs/pumpkin.h +0 -1
@@ -23,7 +23,6 @@#define CONFIG_SYS_NS16550_COM1 0x11005000#define CONFIG_SYS_NS16550_CLK 26000000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)
include/configs/tegra-common.h +0 -1
@@ -61,7 +61,6 @@#define PHYS_SDRAM_1 NV_PA_SDRC_CS0#define PHYS_SDRAM_1_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1#define CONFIG_SYS_BOOTMAPSZ (256 << 20)/* 256M */
include/configs/x600.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_SYS_SPL_LEN CONFIG_SPL_PAD_TO#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + \ CONFIG_SYS_SPL_LEN) -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_MONITOR_LEN 0x60000
include/configs/xilinx_zynqmp_r5.h +0 -2
@@ -35,8 +35,6 @@/* Extend size of kernel image for uncompression */ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SKIP_LOWLEVEL_INIT /* 0x0 - 0x40 is used for placing exception vectors */
include/configs/zynq-common.h +0 -2
@@ -274,6 +274,4 @@#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#endif /* __CONFIG_ZYNQ_COMMON_H */
Signature · 1 line
2.17.1
PATCH 2/2 treewide: Remove CONFIG_SYS_UBOOT_START from configs board files
Quoted 174 lines · On Fri, 6 Dec 2019 15:01:49 +0100 Patrice Chotard <[email protected]>…
As previous
CONFIG_SYS_UBOOT_STARTis now set by default toCONFIG_SYS_TEXT_BASEwhen not defined,CONFIG_SYS_UBOOT_STARTcan be removed frominclude/configsboard files.Signed-off-by Patrice Chotard <[email protected]>---
include/configs/gardena-smart-gateway-at91sam.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/mccmon6.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mt7623.h | 1 - include/configs/mt7629.h | 1 - include/configs/mt8518.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/pumpkin.h | 1 - include/configs/tegra-common.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/zynq-common.h | 2 -- 13 files changed, 16 deletions(-)(quoted diff) +0
-0
b/include/configs/gardena-smart-gateway-at91sam.hindex482e4714b1..f5ee65cb8a100644 ---a/include/configs/gardena-smart-gateway-at91sam.h+++b/include/configs/gardena-smart-gateway-at91sam.h@@ -64,7 +64,6 @@
#defineCONFIG_SPL_NAND_RAW_ONLY
#defineCONFIG_SYS_NAND_U_BOOT_OFFS0x40000
#defineCONFIG_SYS_NAND_U_BOOT_SIZE0xa0000
-#defineCONFIG_SYS_UBOOT_STARTCONFIG_SYS_TEXT_BASE#defineCONFIG_SYS_NAND_U_BOOT_STARTCONFIG_SYS_TEXT_BASE#defineCONFIG_SYS_NAND_U_BOOT_DSTCONFIG_SYS_TEXT_BASE(quoted diff) +0
-0
b/include/configs/ls1046a_common.hindexcc8f4c0210..6543cfd868100644include/configs/ls1046a_common.h +0
-1@@ -98,7 +98,6 @@ CONFIG_SPL_BSS_MAX_SIZE)#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000#define CONFIG_SYS_MONITOR_LEN 0x100000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#endif /* NAND SPL */ include/configs/mccmon6.h +0
-1@@ -12,7 +12,6 @@#define CONFIG_SPL_LIBCOMMON_SUPPORT #include "imx6_spl.h" -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000(quoted diff) +0
-0
b/include/configs/microblaze-generic.hindex385b30c99b..8ca0e83c78100644 ---a/include/configs/microblaze-generic.h
+++b/include/configs/microblaze-generic.hinclude/configs/microblaze-generic.h +0
-2@@ -173,8 +173,6 @@/* Just for sure that there is a space for stack */ #define CONFIG_SPL_STACK_SIZE 0x100 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_INIT_RAM_SIZE - \ CONFIG_SYS_INIT_RAM_ADDR - \ CONFIG_SYS_MALLOC_F_LEN - \include/configs/mt7623.h +1
-1@@ -31,7 +31,6 @@#define CONFIG_ENV_OVERWRITE /* Preloader -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)include/configs/mt7629.h +1
-1@@ -40,7 +40,6 @@#define CONFIG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)/* SPL -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)include/configs/mt8518.h +0
-1@@ -29,7 +29,6 @@#define CONFIG_SYS_BOOTM_LEN SZ_64M/* Uboot definition */ -#define CONFIG_SYS_UBOOT_START
CONFIG_SYS_TEXT_BASE#defineCONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_TEXT_BASE + \ SZ_2M - \include/configs/mt8518.h +0
-0GENERATED_GBL_DATA_SIZE)(quoted diff) +0
-0
b/include/configs/omap3_cairo.hindex1b1a56d7cd..c76c81ddd5100644include/configs/omap3_cairo.h +0
-1@@ -26,7 +26,6 @@* other needs. We use this rather than the inherited defines from * ti_armv7_common.h for backwards compatibility. */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SPL_BSS_START_ADDR 0x80000000#define CONFIG_SPL_BSS_MAX_SIZE (512 << 10)/* 512 KB */ #define
CONFIG_SYS_SPL_MALLOC_START0x80208000include/configs/pumpkin.h +1
-1@@ -23,7 +23,6 @@#define CONFIG_SYS_NS16550_COM1 0x11005000#define CONFIG_SYS_NS16550_CLK 26000000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE)(quoted diff) +0
-0
b/include/configs/tegra-common.hindexb4da1f8428..f2cdd9c019100644include/configs/tegra-common.h +0
-1@@ -61,7 +61,6 @@#define PHYS_SDRAM_1 NV_PA_SDRC_CS0#define PHYS_SDRAM_1_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1#define CONFIG_SYS_BOOTMAPSZ (256 << 20)/* 256M */ include/configs/x600.h +0
-1@@ -27,7 +27,6 @@#define CONFIG_SYS_SPL_LEN CONFIG_SPL_PAD_TO#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + \ CONFIG_SYS_SPL_LEN) -#define CONFIG_SYS_UBOOT_START
CONFIG_SYS_TEXT_BASE#defineCONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN 0x60000(quoted diff) +0
-0
b/include/configs/xilinx_zynqmp_r5.hindex38d952d0c0..155d7fe883100644 ---a/include/configs/xilinx_zynqmp_r5.h
+++b/include/configs/xilinx_zynqmp_r5.hinclude/configs/x600.h +0
-2@@ -35,8 +35,6 @@/* Extend size of kernel image for uncompression */ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SKIP_LOWLEVEL_INIT /* 0x0 - 0x40 is used for placing exception vectors */ (quoted diff) +0
-0
b/include/configs/zynq-common.hindex274cc19112..189ca81bbe100644
include/configs/zynq-common.h line 277
Quoted 6 lines
include/configs/zynq-common.h +0
-2@@ -274,6 +274,4 @@#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000 -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE -#endif /* __CONFIG_ZYNQ_COMMON_H */
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191208/af449129/attachment.sig>
PATCH 2/2 treewide: Remove CONFIG_SYS_UBOOT_START from configs board files
In reply to Patrice ChotardQuoted 6 lines · Patrice Chotard
As previous
CONFIG_SYS_UBOOT_STARTis now set by default toCONFIG_SYS_TEXT_BASEwhen not defined,CONFIG_SYS_UBOOT_STARTcan be removed frominclude/configsboard files.Signed-off-by Patrice Chotard <[email protected]>Acked-by Lukasz Majewski <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200108/38232a0b/attachment.sig>