Commit 1cc95f6e authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu

ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE

Signed-off-by: 's avatarNobuhiro Iwamatsu <iwamatsu@nigauri.org>
parent 7a7d246d
...@@ -575,9 +575,11 @@ config AM43XX ...@@ -575,9 +575,11 @@ config AM43XX
protocols, dual camera support, optional 3D graphics protocols, dual camera support, optional 3D graphics
and an optional customer programmable secure boot. and an optional customer programmable secure boot.
config RMOBILE config ARCH_RMOBILE
bool "Renesas ARM SoCs" bool "Renesas ARM SoCs"
select CPU_V7 select CPU_V7
select DM
select DM_SERIAL
config TARGET_S32V234EVB config TARGET_S32V234EVB
bool "Support s32v234evb" bool "Support s32v234evb"
......
...@@ -59,7 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx ...@@ -59,7 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_SUNXI) += sunxi
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_RMOBILE) += rmobile machine-$(CONFIG_ARCH_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_STM32) += stm32 machine-$(CONFIG_STM32) += stm32
machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_TEGRA) += tegra
......
if RMOBILE if ARCH_RMOBILE
choice choice
prompt "Renesus ARM SoCs board select" prompt "Renesus ARM SoCs board select"
......
#ifndef __ASM_ARCH_RMOBILE_H #ifndef __ASM_ARCH_RMOBILE_H
#define __ASM_ARCH_RMOBILE_H #define __ASM_ARCH_RMOBILE_H
#if defined(CONFIG_RMOBILE) #if defined(CONFIG_ARCH_RMOBILE)
#if defined(CONFIG_SH73A0) #if defined(CONFIG_SH73A0)
#include <asm/arch/sh73a0.h> #include <asm/arch/sh73a0.h>
#elif defined(CONFIG_R8A7740) #elif defined(CONFIG_R8A7740)
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#else #else
#error "SOC Name not defined" #error "SOC Name not defined"
#endif #endif
#endif /* CONFIG_RMOBILE */ #endif /* CONFIG_ARCH_RMOBILE */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
u32 rmobile_get_cpu_type(void); u32 rmobile_get_cpu_type(void);
......
...@@ -315,7 +315,7 @@ int dram_init(void) ...@@ -315,7 +315,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
int board_late_init(void) int board_late_init(void)
......
...@@ -349,7 +349,7 @@ int board_init(void) ...@@ -349,7 +349,7 @@ int board_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
int dram_init(void) int dram_init(void)
......
...@@ -217,7 +217,7 @@ int dram_init(void) ...@@ -217,7 +217,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/rmobile.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 */ /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
enum { enum {
...@@ -993,8 +993,8 @@ void qos_init(void) ...@@ -993,8 +993,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon); writel(0x00000001, &axi_qos->qosqon);
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -201,7 +201,7 @@ int dram_init(void) ...@@ -201,7 +201,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.311 */ /* QoS version 0.311 */
enum { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
...@@ -1196,8 +1196,8 @@ void qos_init(void) ...@@ -1196,8 +1196,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon); writel(0x00000001, &axi_qos->qosqon);
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev) ...@@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
/* QoS version 0.240 for ES1 and version 0.411 for ES2 */ /* 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 { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
...@@ -1384,8 +1384,8 @@ void qos_init(void) ...@@ -1384,8 +1384,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon); writel(0x00000001, &axi_qos->qosqon);
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -235,7 +235,7 @@ int dram_init(void) ...@@ -235,7 +235,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */ /* 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 { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
...@@ -2426,8 +2426,8 @@ void qos_init(void) ...@@ -2426,8 +2426,8 @@ void qos_init(void)
else else
qos_init_es1(); qos_init_es1();
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev) ...@@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
/* QoS version 0.240 for ES1 and version 0.334 for ES2 */ /* 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 { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
...@@ -1305,8 +1305,8 @@ void qos_init(void) ...@@ -1305,8 +1305,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon); writel(0x00000001, &axi_qos->qosqon);
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.11 */ /* QoS version 0.11 */
enum { enum {
...@@ -944,8 +944,8 @@ void qos_init(void) ...@@ -944,8 +944,8 @@ void qos_init(void)
writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosthres2);
writel(0x00000001, &axi_qos->qosqon); writel(0x00000001, &axi_qos->qosqon);
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -192,7 +192,7 @@ int dram_init(void) ...@@ -192,7 +192,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */ /* 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 { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
...@@ -2428,8 +2428,8 @@ void qos_init(void) ...@@ -2428,8 +2428,8 @@ void qos_init(void)
else else
qos_init_es1(); qos_init_es1();
} }
#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ #else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
void qos_init(void) void qos_init(void)
{ {
} }
#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ #endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
...@@ -217,7 +217,7 @@ int dram_init(void) ...@@ -217,7 +217,7 @@ int dram_init(void)
} }
const struct rmobile_sysinfo sysinfo = { const struct rmobile_sysinfo sysinfo = {
CONFIG_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_BOARD_STRING
}; };
static const struct sh_serial_platdata serial_platdata = { static const struct sh_serial_platdata serial_platdata = {
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_ALT=y CONFIG_TARGET_ALT=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_TARGET_ARMADILLO_800EVA=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_GOSE=y CONFIG_TARGET_GOSE=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_KOELSCH=y CONFIG_TARGET_KOELSCH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_KZM9G=y CONFIG_TARGET_KZM9G=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_SYS_PROMPT="KZM-A9-GT# " CONFIG_SYS_PROMPT="KZM-A9-GT# "
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_LAGER=y CONFIG_TARGET_LAGER=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_PORTER=y CONFIG_TARGET_PORTER=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_SILK=y CONFIG_TARGET_SILK=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_STOUT=y CONFIG_TARGET_STOUT=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CMD_BDI is not set # CONFIG_CMD_BDI is not set
......
...@@ -196,7 +196,7 @@ struct sh_mmcif_regs { ...@@ -196,7 +196,7 @@ struct sh_mmcif_regs {
#define SOFT_RST_OFF (0 << 31) #define SOFT_RST_OFF (0 << 31)
#define CLKDEV_EMMC_DATA 52000000 /* 52MHz */ #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_MIN(clk) (clk / (1 << 9))
#define MMC_CLK_DIV_MAX(clk) (clk / (1 << 1)) #define MMC_CLK_DIV_MAX(clk) (clk / (1 << 1))
#else #else
......
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7794 #define CONFIG_R8A7794
#define CONFIG_RMOBILE_BOARD_STRING "Alt" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000 #define CONFIG_SYS_TEXT_BASE 0x70000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE6304000 #define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif #endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else #else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC #define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7740 #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 #define CONFIG_SH_GPIO_PFC
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
......
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7793 #define CONFIG_R8A7793
#define CONFIG_RMOBILE_BOARD_STRING "Gose" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000 #define CONFIG_SYS_TEXT_BASE 0x70000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE6304000 #define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif #endif
/* STACK */ /* STACK */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else #else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC #define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC
......
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7791 #define CONFIG_R8A7791
#define CONFIG_RMOBILE_BOARD_STRING "Koelsch" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000 #define CONFIG_SYS_TEXT_BASE 0x70000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE6304000 #define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif #endif
/* STACK */ /* STACK */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else #else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC #define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define CONFIG_SH73A0 #define CONFIG_SH73A0
#define CONFIG_KZM_A9_GT #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_MACH_TYPE MACH_TYPE_KZM9G
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7790 #define CONFIG_R8A7790
#define CONFIG_RMOBILE_BOARD_STRING "Lager" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0xB0000000 #define CONFIG_SYS_TEXT_BASE 0xB0000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE8080000 #define CONFIG_SYS_TEXT_BASE 0xE8080000
......
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7791 #define CONFIG_R8A7791
#define CONFIG_RMOBILE_BOARD_STRING "Porter" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000 #define CONFIG_SYS_TEXT_BASE 0x70000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE6304000 #define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif #endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else #else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC #define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC
......
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7794 #define CONFIG_R8A7794
#define CONFIG_RMOBILE_BOARD_STRING "Silk" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0x70000000 #define CONFIG_SYS_TEXT_BASE 0x70000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE6304000 #define CONFIG_SYS_TEXT_BASE 0xE6304000
#endif #endif
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC
#else #else
#define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC #define CONFIG_SYS_INIT_SP_ADDR 0xE633FFFC
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#undef DEBUG #undef DEBUG
#define CONFIG_R8A7790 #define CONFIG_R8A7790
#define CONFIG_RMOBILE_BOARD_STRING "Stout" #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
#include "rcar-gen2-common.h" #include "rcar-gen2-common.h"
/* #define CONFIG_BOARD_LATE_INIT */ /* #define CONFIG_BOARD_LATE_INIT */
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
#define CONFIG_SYS_TEXT_BASE 0xB0000000 #define CONFIG_SYS_TEXT_BASE 0xB0000000
#else #else
#define CONFIG_SYS_TEXT_BASE 0xE8080000 #define CONFIG_SYS_TEXT_BASE 0xE8080000
......
...@@ -47,7 +47,7 @@ struct tmu_regs { ...@@ -47,7 +47,7 @@ struct tmu_regs {
}; };
#endif /* CONFIG_CPU_SH3 */ #endif /* CONFIG_CPU_SH3 */
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_RMOBILE)