Move i.MX7 TEXT_BASE/SPL_TEXT_BASE to Kconfig and common/spl/Kconfig which is the best practice.
Signed-off-by: Marek Vasut marex@denx.de --- Cc: "NXP i.MX U-Boot Team" uboot-imx@nxp.com Cc: Adam Ford aford173@gmail.com Cc: Christoph Niedermaier cniedermaier@dh-electronics.com Cc: Fabio Estevam festevam@gmail.com Cc: Francesco Dolcini francesco.dolcini@toradex.com Cc: Frieder Schrempf frieder.schrempf@kontron.de Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Igor Opaniuk igor.opaniuk@foundries.io Cc: Ilias Apalodimas ilias.apalodimas@linaro.org Cc: Michael Trimarchi michael@amarulasolutions.com Cc: Peng Fan peng.fan@nxp.com Cc: Quentin Schulz quentin.schulz@cherry.de Cc: Sean Anderson seanga2@gmail.com Cc: Simon Glass sjg@chromium.org Cc: Tim Harvey tharvey@gateworks.com Cc: Tom Rini trini@konsulko.com Cc: u-boot@dh-electronics.com --- V2: - New patch
Signed-off-by: Marek Vasut marex@denx.de --- Kconfig | 1 + arch/arm/mach-imx/mx7/Kconfig | 7 ------- common/spl/Kconfig | 1 + 3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Kconfig b/Kconfig index b1dd4556a4e..a7b2b6db742 100644 --- a/Kconfig +++ b/Kconfig @@ -648,6 +648,7 @@ config TEXT_BASE depends on HAVE_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x17800000 if ARCH_MX6 + default 0x87800000 if ARCH_MX7 default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x81700000 if MACH_SUNIV default 0x2a000000 if MACH_SUN9I diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 2e68557d6a9..4e0e8ed0582 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -17,13 +17,6 @@ config MX7D select ROM_UNIFIED_SECTIONS imply CMD_FUSE
-config TEXT_BASE - default 0x87800000 - -config SPL_TEXT_BASE - depends on SPL - default 0x00912000 - choice prompt "MX7 board select" optional diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ed997d82cfc..045fcac10a5 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -272,6 +272,7 @@ config SPL_TEXT_BASE default 0x402F4000 if AM43XX default 0x402F0400 if AM33XX default 0x00908000 if ARCH_MX6 + default 0x00912000 if ARCH_MX7 default 0x40301350 if OMAP54XX default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I default 0x20060 if SUN50I_GEN_H6 || SUNXI_GEN_NCAT2