From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lokesh Vutla Date: Fri, 19 Aug 2016 09:42:28 +0530 Subject: [U-Boot] [PATCH 03/13] spl: Kconfig: Add CONFIG_SPL_TEXT_BASE as Kconfig option In-Reply-To: <20160818154146.16788-4-afd@ti.com> References: <20160818154146.16788-1-afd@ti.com> <20160818154146.16788-4-afd@ti.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thursday 18 August 2016 09:11 PM, Andrew F. Davis wrote: > Add a new Kconfig CONFIG_SPL_TEXT_BASE. Add its use to > am335x_evm_defconfig, then only conditionally define it in > ti_am335x_common.h when it is not already defined, this allows for > systems that have not fully converted to the Kconfig based config > system to still include this header without redefining this symbol > on platforms that have. > > Signed-off-by: Andrew F. Davis > --- > Kconfig | 8 ++++++++ > configs/am335x_evm_defconfig | 1 + > include/configs/ti_am335x_common.h | 2 ++ > 3 files changed, 11 insertions(+) > > diff --git a/Kconfig b/Kconfig > index cb5af5b..f67e7c8 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -319,6 +319,14 @@ config SYS_TEXT_BASE > help > TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture > > +config SPL_TEXT_BASE > + hex "Text Base" > + depends on SPL > + help > + When SPL is enabled the image is linked with this as the > + starting address in memeory for which the SPL will be loaded. > + TODO: Move CONFIG_SPL_TEXT_BASE for all the architecture Nice to see this in a common place. There are some boards which has already defined this as Kconfig option. You need to remove the current definition or else build might break. Thanks and regards, Lokesh > + > config SPL_LOAD_FIT > bool "Enable SPL loading U-Boot as a FIT" > depends on FIT > diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig > index 6885230..b1264d7 100644 > --- a/configs/am335x_evm_defconfig > +++ b/configs/am335x_evm_defconfig > @@ -3,6 +3,7 @@ CONFIG_TARGET_AM335X_EVM=y > CONFIG_SPL_STACK_R_ADDR=0x82000000 > CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" > CONFIG_SPL=y > +CONFIG_SPL_TEXT_BASE=0x402F0400 > CONFIG_SPL_STACK_R=y > CONFIG_SYS_EXTRA_OPTIONS="NAND" > CONFIG_HUSH_PARSER=y > diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h > index bcd56fc..25c9643 100644 > --- a/include/configs/ti_am335x_common.h > +++ b/include/configs/ti_am335x_common.h > @@ -58,7 +58,9 @@ > * supports X-MODEM loading via UART, and we leverage this and then use > * Y-MODEM to load u-boot.img, when booted over UART. > */ > +#ifndef CONFIG_SPL_TEXT_BASE > #define CONFIG_SPL_TEXT_BASE 0x402F0400 > +#endif > #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) > #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ > (128 << 20)) >