diff options
40 files changed, 69 insertions, 67 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e6940e6206..413d269d26 100644 --- 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 43ae79a6ef..5000d87fd0 100644 --- 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 85c06eb45f..5915768928 100644 --- 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 65ee9eb547..46e821d263 100644 --- 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 0e9c22296a..28e61116a3 100644 --- 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 ea36fa4e19..a284721cfd 100644 --- 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 3501a17044..a1a26a6d82 100644 --- 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 b6324c8fd7..3323c3aee1 100644 --- 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 bace439235..3a8bf862d5 100644 --- 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 413ad1124b..0317ea26c7 100644 --- 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 51e70e222d..b741e2e186 100644 --- 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 8cb2b48f57..16118d72a0 100644 --- 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 83260a1c1a..6fed2f9796 100644 --- 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 ae155512f5..25b8d0956a 100644 --- 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 b5378defa8..f6467ee2d9 100644 --- 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 491d1bab86..6b19c5e29c 100644 --- 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 4f6e46ce52..f86fd01b67 100644 --- 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 021baabc65..4ec3f92ca3 100644 --- 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 d49a0ab72b..f29c5c99d5 100644 --- 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 7df7394091..672a730f07 100644 --- 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 661d544545..90fd48bb3f 100644 --- 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 9bae3c3efa..3bd4680a28 100644 --- 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 f2075fe27d..6cc073640b 100644 --- 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 217a868230..9672d4ec35 100644 --- 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 00a54416b5..f1ef1c49b3 100644 --- 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 19dd1fe27e..1b0d780e73 100644 --- 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 a587ed5ab2..f244afcc2a 100644 --- 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 f5d7afde58..02ba88aa6e 100644 --- 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 9073c17875..9eb4741e36 100644 --- 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 2f65f9d264..445465ec48 100644 --- 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 3a81c49b89..9955674afd 100644 --- 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 522b287104..e9cab5c695 100644 --- 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 230be3168a..18eaf25e7b 100644 --- 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 121fe3f534..b98fc29832 100644 --- 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 1b4c7d4388..94f3516159 100644 --- 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 9971ad8082..3be1540d13 100644 --- 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 929eedee31..e3bf33cc14 100644 --- 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 dca0623485..8c4ee4f6ad 100644 --- 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 d21c3cbdeb..8833c50b42 100644 --- 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 97d578dd55..aa60c98750 100644 --- 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; |