ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e6940e6206372dcf9ab8f6f8381abe907ec36d37..413d269d26e814b4fe3ee17dc2bcc920323bd418 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -575,9 +575,11 @@ config AM43XX
          protocols, dual camera support, optional 3D graphics
          and an optional customer programmable secure boot.
 
-config RMOBILE
+config ARCH_RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
+       select DM
+       select DM_SERIAL
 
 config TARGET_S32V234EVB
        bool "Support s32v234evb"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 43ae79a6efb464547cc6898125f5286769dff3b0..5000d87fd0b193ffbce272863be9d4b19d7429d1 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -59,7 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX)                += s5pc1xx
 machine-$(CONFIG_ARCH_SUNXI)           += sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)      += snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)         += socfpga
-machine-$(CONFIG_RMOBILE)              += rmobile
+machine-$(CONFIG_ARCH_RMOBILE)         += rmobile
 machine-$(CONFIG_ARCH_ROCKCHIP)                += rockchip
 machine-$(CONFIG_STM32)                        += stm32
 machine-$(CONFIG_TEGRA)                        += tegra

diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index 85c06eb45f3f203f5213614317f095b05ae13754..5915768928f97adc57fe934c060507f335cd50a3 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,4 +1,4 @@
-if RMOBILE
+if ARCH_RMOBILE
 
 choice
        prompt "Renesus ARM SoCs board select"

diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index 65ee9eb54718e3addb0eaeb3b95c393ed0cea040..46e821d26376d25df2e124997cc2bff3b432fe81 100644 (file)
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_ARCH_RMOBILE_H
 #define __ASM_ARCH_RMOBILE_H
 
-#if defined(CONFIG_RMOBILE)
+#if defined(CONFIG_ARCH_RMOBILE)
 #if defined(CONFIG_SH73A0)
 #include <asm/arch/sh73a0.h>
 #elif defined(CONFIG_R8A7740)
@@ -17,7 +17,7 @@
 #else
 #error "SOC Name not defined"
 #endif
-#endif /* CONFIG_RMOBILE */
+#endif /* CONFIG_ARCH_RMOBILE */
 
 #ifndef __ASSEMBLY__
 u32 rmobile_get_cpu_type(void);

diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 0e9c22296a3e42736bbd5ae44ca8c2ad8488e592..28e61116a39d0180a5d0f96cf88ac888b45f2dc6 100644 (file)
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -315,7 +315,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 int board_late_init(void)

diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index ea36fa4e192f06223cfb5588e6242c3d3e09d1a7..a284721cfde05dfd9e28b3c48a4485fee980ed8c 100644 (file)
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -349,7 +349,7 @@ int board_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 int dram_init(void)

diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 3501a170442c2c2ef2ee3356cd44399fdf21463c..a1a26a6d821657eaf840feae00ef9bcd3b316dab 100644 (file)
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -217,7 +217,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c
index b6324c8fd7cf15ae1e32dc88824fc967cca2d5ee..3323c3aee1513541cd9e259eb9fe50846e1416c5 100644 (file)
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -13,7 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
 
 enum {
@@ -993,8 +993,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index bace439235ba040d6dcdfbd79b1a2bb70ae7a510..3a8bf862d5b1a14310b60a2fe02b8985b12ca2f3 100644 (file)
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -201,7 +201,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/gose/qos.c b/board/renesas/gose/qos.c
index 413ad1124bb4fb4f10d971898b5946692158a623..0317ea26c7d9d278440b92884ddc290e7718f7e3 100644 (file)
--- a/board/renesas/gose/qos.c
+++ b/board/renesas/gose/qos.c
@@ -13,7 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 */
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
@@ -1196,8 +1196,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 51e70e222dee3ca8c69b31db0a06cb5654b364f9..b741e2e186c8a0d866f6d6f0cec14f776a1f6831 100644 (file)
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c
index 8cb2b48f574571f390cfdeaab11441ff92893740..16118d72a04914a84901bdc8896a31cf182b626d 100644 (file)
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -14,7 +14,7 @@
 #include <asm/arch/rmobile.h>
 
 /* QoS version 0.240 for ES1 and version 0.411 for ES2 */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
        DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -1384,8 +1384,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 83260a1c1a460bc6dba4a09f29b761dd739cf437..6fed2f9796b3d071ff4f40b5c8c0078c9deff7fc 100644 (file)
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -235,7 +235,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c
index ae155512f58a35fdc4dfa3455e19302f83924459..25b8d0956a78af5dfd23372ef1e078b1d526dfac 100644 (file)
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -13,7 +13,7 @@
 #include <asm/arch/rmobile.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
        DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -2426,8 +2426,8 @@ void qos_init(void)
        else
                qos_init_es1();
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index b5378defa86337ea41b27d99edd62d94ec03814b..f6467ee2d9566c3f70f9c64d992ef6f39bc92985 100644 (file)
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/porter/qos.c b/board/renesas/porter/qos.c
index 491d1bab86e9b38c391201da5ab4fe15b5a59ee5..6b19c5e29cd92911b53486e1e73905d4beb7e54b 100644 (file)
--- a/board/renesas/porter/qos.c
+++ b/board/renesas/porter/qos.c
@@ -15,7 +15,7 @@
 #include <asm/arch/rmobile.h>
 
 /* QoS version 0.240 for ES1 and version 0.334 for ES2 */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
        DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -1305,8 +1305,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c
index 4f6e46ce5272648e2153b310b7ba794d8b80f42b..f86fd01b67e3001a10c3b0246cc9b0a2d01e5d84 100644 (file)
--- a/board/renesas/silk/qos.c
+++ b/board/renesas/silk/qos.c
@@ -14,7 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.11 */
 
 enum {
@@ -944,8 +944,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 021baabc657a961cad0eeeeba6663001c0207948..4ec3f92ca37102776a65be86acd7f25e79172939 100644 (file)
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -192,7 +192,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)

diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c
index d49a0ab72b543db2d233961e05ae84d102e30690..f29c5c99d52f388e0de458bbc81a284319bba060 100644 (file)
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -15,7 +15,7 @@
 #include <asm/arch/rmobile.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
        DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -2428,8 +2428,8 @@ void qos_init(void)
        else
                qos_init_es1();
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */

diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 7df739409156decc93ab2af43113b054d5daa0a4..672a730f0744a0c0773ff608032c361c7a3fc3a4 100644 (file)
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -217,7 +217,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 static const struct sh_serial_platdata serial_platdata = {

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 661d5445456ffc0a5fd866c0ccfbe539f4baf0fc..90fd48bb3f0631d438ec34f8f0f993a4fc571782 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_ALT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 9bae3c3efac6d162cd24d538437e954062860367..3bd4680a28a616111e2d726bcd27988617dbd240 100644 (file)
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_ARMADILLO_800EVA=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index f2075fe27db553101c6f1b8ec6da2a1078e5b3aa..6cc073640bf2ddb82ff64057bde25fc5467b37f7 100644 (file)
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_GOSE=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 217a868230b5c263cf334d60d3fd35c13bb7fb7f..9672d4ec353a258b9096bb1f2b6ba84ba80174dd 100644 (file)
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_KOELSCH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 00a54416b57ebb9241eb449854387da10f112550..f1ef1c49b30796f965fabd443b885059416a427d 100644 (file)
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_KZM9G=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_PROMPT="KZM-A9-GT# "

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 19dd1fe27ee3d180ec093623ad793ebd347ba752..1b0d780e7364d7734bf7bf796d7e3601a4d9c0f0 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_LAGER=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index a587ed5ab2c4ae35d3292b19d1b225eade588eb0..f244afcc2a5b5c34c23db85ddd0b79df4c5fc274 100644 (file)
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_PORTER=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index f5d7afde5810077735f3e8748f247ef38a112358..02ba88aa6ec59b7ef1bc054176ee1d16fe2afa94 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_SILK=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 9073c1787555ccacc92d5115192e8e1b0c1bb76b..9eb4741e3637a72745b6809fe83ef19ea5aff85f 100644 (file)
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_RMOBILE=y
+CONFIG_ARCH_RMOBILE=y
 CONFIG_TARGET_STOUT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CMD_BDI is not set

diff --git a/drivers/mmc/sh_mmcif.h b/drivers/mmc/sh_mmcif.h
index 2f65f9d2640f9fbb8f14addd8bf9876d78ed5757..445465ec487cdb9a54aa71f654d4a0b77be78d73 100644 (file)
--- a/drivers/mmc/sh_mmcif.h
+++ b/drivers/mmc/sh_mmcif.h
@@ -196,7 +196,7 @@ struct sh_mmcif_regs {
 #define SOFT_RST_OFF           (0 << 31)
 
 #define CLKDEV_EMMC_DATA       52000000        /* 52MHz */
-#ifdef CONFIG_RMOBILE
+#ifdef CONFIG_ARCH_RMOBILE
 #define MMC_CLK_DIV_MIN(clk)   (clk / (1 << 9))
 #define MMC_CLK_DIV_MAX(clk)   (clk / (1 << 1))
 #else

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 3a81c49b894f6064736d4d5af3111122686cec50..9955674afd117cc2d671ec0c743f931cf93dcd9e 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -12,17 +12,17 @@
 
 #undef DEBUG
 #define CONFIG_R8A7794
-#define CONFIG_RMOBILE_BOARD_STRING "Alt"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633FFFC

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 522b28710440e7974cfddc660622cab5102b4d5f..e9cab5c6953d9b8b6a2194a81f926c9ccb5783c2 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -11,7 +11,7 @@
 
 #undef DEBUG
 #define CONFIG_R8A7740
-#define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC
 
 #include <asm/arch/rmobile.h>

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 230be3168ab45d1e48d03d2d7480e2363ddd9fea..18eaf25e7bcd7da9a738a5aaa83c5b4432a245cc 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -11,18 +11,18 @@
 
 #undef DEBUG
 #define CONFIG_R8A7793
-#define CONFIG_RMOBILE_BOARD_STRING "Gose"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
 /* STACK */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633FFFC

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 121fe3f534f8928ed97d9256c8285eedb239099b..b98fc298327238d9f213ffdddf90275563d14994 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -11,18 +11,18 @@
 
 #undef DEBUG
 #define CONFIG_R8A7791
-#define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
 /* STACK */
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633fffC

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 1b4c7d438897f0b2ea095c2c58af6d9d5c14ebd2..94f351615940583ab07bdcf84adee60e8fcf7d65 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -14,7 +14,7 @@
 
 #define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
-#define CONFIG_RMOBILE_BOARD_STRING    "KMC KZM-A9-GT"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING       "KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
 #include <asm/arch/rmobile.h>

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 9971ad80824583c1b5e1770482de087bf77dedf6..3be1540d13f765d6a95f7e3603a022699e9a4856 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -12,11 +12,11 @@
 
 #undef DEBUG
 #define CONFIG_R8A7790
-#define CONFIG_RMOBILE_BOARD_STRING "Lager"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0xB0000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE8080000

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 929eedee31016bd1092a8b688fe9d79119b5a9c2..e3bf33cc1491f597402cadb0b7379988a7c5aa42 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -13,17 +13,17 @@
 
 #undef DEBUG
 #define CONFIG_R8A7791
-#define CONFIG_RMOBILE_BOARD_STRING "Porter"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633fffC

diff --git a/include/configs/silk.h b/include/configs/silk.h
index dca0623485ca61790f470bd436bf42da0280b5a1..8c4ee4f6ad06e529f725e72680910df2d5441732 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -13,17 +13,17 @@
 
 #undef DEBUG
 #define CONFIG_R8A7794
-#define CONFIG_RMOBILE_BOARD_STRING "Silk"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633FFFC

diff --git a/include/configs/stout.h b/include/configs/stout.h
index d21c3cbdeb2f70faa895af9a7e6bf9abc105d62f..8833c50b42a5da3c3b5923e46c4d10142bb11f3e 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -14,13 +14,13 @@
 
 #undef DEBUG
 #define CONFIG_R8A7790
-#define CONFIG_RMOBILE_BOARD_STRING "Stout"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
 
 #include "rcar-gen2-common.h"
 
 /* #define CONFIG_BOARD_LATE_INIT */
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0xB0000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE8080000

diff --git a/include/sh_tmu.h b/include/sh_tmu.h
index 97d578dd55ad5ef1f0c8a873eb33386f261cbeb7..aa60c98750a0311eb4675cd71a96cde7b1f170c4 100644 (file)
--- a/include/sh_tmu.h
+++ b/include/sh_tmu.h
@@ -47,7 +47,7 @@ struct tmu_regs {
 };
 #endif /* CONFIG_CPU_SH3 */
 
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_RMOBILE)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE)
 struct tmu_regs {
        u32 reserved;
        u8  tstr;