rockchip: Move TEXT_BASE to 8 MiB offset from start of DRAM

Drop SoC specific TEXT_BASE and use a common TEXT_BASE for all SoCs.

Move the common TEXT_BASE to 8 MiB offset from start of DRAM to help
support RAM boot from maskrom introduced in next patch.

RAM boot from maskrom mode will expect the FIT payload to be located at
2 MiB offset from start or DRAM.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Tested-by: Arnaud Patard <arnaud.patard@collabora.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 342933ca5099dbd1344a3b8dfc37061cd2c16d58..c9ce30760292340766f15d82b938524223903a80 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -768,9 +768,9 @@ config TPL_SYS_MALLOC_F_LEN
        default 0x4000 if CUSTOM_SYS_INIT_SP_ADDR = 0x03f00000
 
 config TEXT_BASE
-       default 0x60200000 if SPL_TEXT_BASE = 0x60000000
-       default 0x40200000 if SPL_TEXT_BASE = 0x40000000
-       default 0x00200000 if SPL_TEXT_BASE = 0x00000000
+       default 0x60800000 if SPL_TEXT_BASE = 0x60000000
+       default 0x40800000 if SPL_TEXT_BASE = 0x40000000
+       default 0x00800000 if SPL_TEXT_BASE = 0x00000000
 
 config SPL_TEXT_BASE
        default 0x60000000 if ROCKCHIP_RK3036 || ROCKCHIP_RK3066 || \

diff --git a/arch/arm/mach-rockchip/rk3308/Kconfig b/arch/arm/mach-rockchip/rk3308/Kconfig
index 06572d545f6e352b34099423e802090ed058734c..b8d25c5254240aa81a090b03d503e8adb8d27939 100644 (file)
--- a/arch/arm/mach-rockchip/rk3308/Kconfig
+++ b/arch/arm/mach-rockchip/rk3308/Kconfig
@@ -17,9 +17,6 @@ config ROCKCHIP_STIMER_BASE
 config SYS_SOC
        default "rk3308"
 
-config TEXT_BASE
-       default 0x00600000
-
 source "board/rockchip/evb_rk3308/Kconfig"
 source "board/firefly/firefly-rk3308/Kconfig"
 

diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
index 01b53a47ddbe3afee7534999953bdedd5108ea6c..2730220a18e8321bde08beb41844fd1c426f9dc4 100644 (file)
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -70,9 +70,6 @@ config ROCKCHIP_STIMER_BASE
 config SYS_SOC
        default "rk3568"
 
-config TEXT_BASE
-       default 0x00a00000
-
 source "board/rockchip/evb_rk3568/Kconfig"
 source "board/anbernic/rgxx3_rk3566/Kconfig"
 source "board/hardkernel/odroid_m1/Kconfig"

diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
index 9fbe3f225aabddb77d5071b0cceafdbd1a02a8ba..60c16d2f32d27977e5ddf8675b9dfe04da50253b 100644 (file)
--- a/arch/arm/mach-rockchip/rk3588/Kconfig
+++ b/arch/arm/mach-rockchip/rk3588/Kconfig
@@ -417,9 +417,6 @@ config ROCKCHIP_STIMER_BASE
 config SYS_SOC
        default "rk3588"
 
-config TEXT_BASE
-       default 0x00a00000
-
 source "board/armsom/sige7-rk3588/Kconfig"
 source "board/coolpi/genbook_cm5_rk3588/Kconfig"
 source "board/edgeble/neural-compute-module-6/Kconfig"