From 1cc95f6e1b38e96dfbb5ffb9aec211b1d0a88135 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 10 Oct 2015 05:58:28 +0900 Subject: ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE Signed-off-by: Nobuhiro Iwamatsu --- 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 +- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include') diff --git a/include/configs/alt.h b/include/configs/alt.h index 3a81c49..9955674 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 522b287..e9cab5c 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 diff --git a/include/configs/gose.h b/include/configs/gose.h index 230be31..18eaf25 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 121fe3f..b98fc29 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 1b4c7d4..94f3516 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 diff --git a/include/configs/lager.h b/include/configs/lager.h index 9971ad8..3be1540 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 929eede..e3bf33c 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 dca0623..8c4ee4f 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 d21c3cb..8833c50 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; -- cgit v1.1