arm: rmobile: alt: Add external RAM boot

If CONFIG_RMOBILE_EXTRAM_BOOT is enabled, U-Boot is booted from External RAM.
The default boot address is 0x70000000.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
index 082c767d3b5d71b76154af292f7232001e0bc5e6..8444d4224a3e51270b3f2f37e3d5370cd197829e 100644 (file)
--- a/arch/arm/cpu/armv7/rmobile/Kconfig
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
@@ -25,7 +25,7 @@ config SYS_SOC
 
 config RMOBILE_EXTRAM_BOOT
        bool "Enable boot from RAM"
-       depends on TARGET_LAGER || TARGET_KOELSCH
+       depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER
        default n
 
 source "board/atmark-techno/armadillo-800eva/Kconfig"

diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c
index d788aa0ffb9551cd40c20f125c1636bc70322bd6..f0b349f18f5fc91cc353ff2bbecd8f6f68e23575 100644 (file)
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
 
+#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.11 */
 
 enum {
@@ -942,3 +943,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
+#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+void qos_init(void)
+{
+}
+#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 7238f68820e8678b3bec66efe22ad3ccbc531b4b..5a19096629ac78579be0f60069e9472eac42118d 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -34,7 +34,11 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
 
+#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#define CONFIG_SYS_TEXT_BASE   0x70000000
+#else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
+#endif
 #define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_SYS_GENERIC_BOARD
 
@@ -59,7 +63,11 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_TMU_TIMER
 
+#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
+#else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633FFFC
+#endif
 #define STACK_AREA_SIZE                        0xC000
 #define LOW_LEVEL_MERAM_STACK \
                (CONFIG_SYS_INIT_SP_ADDR + STACK_AREA_SIZE - 4)