Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 2 +- arch/arm/mach-rmobile/Kconfig | 2 +- arch/arm/mach-rmobile/include/mach/rmobile.h | 4 ++-- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/alt/qos.c | 6 +++--- board/renesas/gose/gose.c | 2 +- board/renesas/gose/qos.c | 6 +++--- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/koelsch/qos.c | 6 +++--- board/renesas/lager/lager.c | 2 +- board/renesas/lager/qos.c | 6 +++--- board/renesas/porter/porter.c | 2 +- board/renesas/porter/qos.c | 6 +++--- board/renesas/silk/qos.c | 6 +++--- board/renesas/silk/silk.c | 2 +- board/renesas/stout/qos.c | 6 +++--- board/renesas/stout/stout.c | 2 +- configs/alt_defconfig | 2 +- configs/armadillo-800eva_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/kzm9g_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/stout_defconfig | 2 +- drivers/mmc/sh_mmcif.h | 2 +- include/configs/alt.h | 6 +++--- include/configs/armadillo-800eva.h | 2 +- include/configs/gose.h | 6 +++--- include/configs/koelsch.h | 6 +++--- include/configs/kzm9g.h | 2 +- include/configs/lager.h | 4 ++-- include/configs/porter.h | 6 +++--- include/configs/silk.h | 6 +++--- include/configs/stout.h | 4 ++-- include/sh_tmu.h | 2 +- 40 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f22b36b..ed9b6b1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -493,7 +493,7 @@ config OMAP54XX select CPU_V7 select SUPPORT_SPL
-config RMOBILE +config ARCH_RMOBILE bool "Renesas ARM SoCs" select CPU_V7
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 723d539..18224d4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -54,7 +54,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_ARCH_SOCFPGA) += socfpga -machine-$(CONFIG_RMOBILE) += rmobile +machine-$(CONFIG_ARCH_RMOBILE) += rmobile machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index 85c06eb..5915768 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 65ee9eb..46e821d 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 0e9c222..28e6111 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 ea36fa4..a284721 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 3501a17..a1a26a6 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 b6324c8..3323c3a 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 bace439..3a8bf86 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 413ad11..0317ea2 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 51e70e2..b741e2e 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 8cb2b48..16118d7 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 83260a1..6fed2f9 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 ae15551..25b8d09 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 b5378de..f6467ee 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 491d1ba..6b19c5e 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 4f6e46c..f86fd01 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 021baab..4ec3f92 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 d49a0ab..f29c5c9 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 7df7394..672a730 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 479b4a5..617e75c 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 240d72d..08340ef 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/gose_defconfig b/configs/gose_defconfig index b0dfa90..eee5043 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 848aa55..23b4c36 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index 476f5f0..cd6338c 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_SYS_PROMPT="KZM-A9-GT# " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/lager_defconfig b/configs/lager_defconfig index a43aca3..945c53f 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/porter_defconfig b/configs/porter_defconfig index b7c99de..81984a1 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 5afcde3..7a11e3d 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/stout_defconfig b/configs/stout_defconfig index fcfc5c1..7c1aaee 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_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/drivers/mmc/sh_mmcif.h b/drivers/mmc/sh_mmcif.h index 4b6752f..2b4893e 100644 --- a/drivers/mmc/sh_mmcif.h +++ b/drivers/mmc/sh_mmcif.h @@ -199,7 +199,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 6d2c242..faad77f 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 7f5cbcc..495819b 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 c08e73a..c5ed403 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 c905cc2..37d382c 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 8a451ec..98b5c1d 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,7 +12,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 #define CONFIG_SYS_GENERIC_BOARD
diff --git a/include/configs/lager.h b/include/configs/lager.h index 1450e8f..ad8f49d 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 59b14e9..dca0f29 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 cd839aa..2cfa2d6 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 87ea530..33cc309 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 97d578d..aa60c98 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;