| Message ID | 20191206140149.7426-3-patrice.chotard@st.com |
|---|---|
| State | Accepted |
| Commit | 74bb4570a952b06fecfafc5b961a5cb5147ec544 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Fix CONFIG_SYS_UBOOT_START default value | expand |
On Fri, 6 Dec 2019 15:01:49 +0100 Patrice Chotard <patrice.chotard@st.com> wrote: > As 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. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > > --- > > 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(-) > > diff --git a/include/configs/gardena-smart-gateway-at91sam.h > b/include/configs/gardena-smart-gateway-at91sam.h index > 482e4714b1..f5ee65cb8a 100644 --- > a/include/configs/gardena-smart-gateway-at91sam.h +++ > b/include/configs/gardena-smart-gateway-at91sam.h @@ -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 > diff --git a/include/configs/ls1046a_common.h > b/include/configs/ls1046a_common.h index cc8f4c0210..6543cfd868 100644 > --- a/include/configs/ls1046a_common.h > +++ b/include/configs/ls1046a_common.h > @@ -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 */ > diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h > index 045a9f7bdf..0aee1e1cf6 100644 > --- a/include/configs/mccmon6.h > +++ b/include/configs/mccmon6.h > @@ -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 > > diff --git a/include/configs/microblaze-generic.h > b/include/configs/microblaze-generic.h index 385b30c99b..8ca0e83c78 > 100644 --- a/include/configs/microblaze-generic.h > +++ b/include/configs/microblaze-generic.h > @@ -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 - \ > diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h > index e5182aeea8..faab0913fc 100644 > --- a/include/configs/mt7623.h > +++ b/include/configs/mt7623.h > @@ -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) > > diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h > index 4aef894c6e..6a6c2f2414 100644 > --- a/include/configs/mt7629.h > +++ b/include/configs/mt7629.h > @@ -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) > > diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h > index a7fe83a605..514722be99 100644 > --- a/include/configs/mt8518.h > +++ b/include/configs/mt8518.h > @@ -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) > diff --git a/include/configs/omap3_cairo.h > b/include/configs/omap3_cairo.h index 1b1a56d7cd..c76c81ddd5 100644 > --- a/include/configs/omap3_cairo.h > +++ b/include/configs/omap3_cairo.h > @@ -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 > diff --git a/include/configs/pumpkin.h b/include/configs/pumpkin.h > index 35e28be950..9c52cae41d 100644 > --- a/include/configs/pumpkin.h > +++ b/include/configs/pumpkin.h > @@ -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) > > diff --git a/include/configs/tegra-common.h > b/include/configs/tegra-common.h index b4da1f8428..f2cdd9c019 100644 > --- a/include/configs/tegra-common.h > +++ b/include/configs/tegra-common.h > @@ -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 */ > diff --git a/include/configs/x600.h b/include/configs/x600.h > index 63092b24a5..8b6caae7be 100644 > --- a/include/configs/x600.h > +++ b/include/configs/x600.h > @@ -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 > diff --git a/include/configs/xilinx_zynqmp_r5.h > b/include/configs/xilinx_zynqmp_r5.h index 38d952d0c0..155d7fe883 > 100644 --- a/include/configs/xilinx_zynqmp_r5.h > +++ b/include/configs/xilinx_zynqmp_r5.h > @@ -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 */ > diff --git a/include/configs/zynq-common.h > b/include/configs/zynq-common.h index 274cc19112..189ca81bbe 100644 > --- a/include/configs/zynq-common.h > +++ b/include/configs/zynq-common.h > @@ -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 */ Acked-by: Lukasz Majewski <lukma@denx.de> 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@denx.de
On Fri, Dec 06, 2019 at 03:01:49PM +0100, Patrice Chotard wrote: > As 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. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > Acked-by: Lukasz Majewski <lukma@denx.de> Applied to u-boot/master, thanks!
diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 482e4714b1..f5ee65cb8a 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -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 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index cc8f4c0210..6543cfd868 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -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 */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 045a9f7bdf..0aee1e1cf6 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -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 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 385b30c99b..8ca0e83c78 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -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 - \ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index e5182aeea8..faab0913fc 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -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) diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 4aef894c6e..6a6c2f2414 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -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) diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index a7fe83a605..514722be99 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -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) diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 1b1a56d7cd..c76c81ddd5 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -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 diff --git a/include/configs/pumpkin.h b/include/configs/pumpkin.h index 35e28be950..9c52cae41d 100644 --- a/include/configs/pumpkin.h +++ b/include/configs/pumpkin.h @@ -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) diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index b4da1f8428..f2cdd9c019 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -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 */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 63092b24a5..8b6caae7be 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -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 diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index 38d952d0c0..155d7fe883 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -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 */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 274cc19112..189ca81bbe 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -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 */
As 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. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- 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(-)