ARM: imx: soc: Move default TEXT_BASE for i.MX7

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>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index b1dd4556a4e1cf67122ad56a3c689969632a4e5c..a7b2b6db74255b214e41affdb31899c6ac284101 100644 (file)
--- 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 2e68557d6a90585bca5a2470dcd2ed3dd1acc7a3..4e0e8ed0582185581f764b1794928e1e7b20e7e1 100644 (file)
--- 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 ed997d82cfc8fbb3b99672ad26a8c505714c8be8..045fcac10a5f1f123882861a5e0c8672be2dd69e 100644 (file)
--- 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