[U-Boot] [PATCH v2 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as CONFIG_ARCH_RMOBILE_BOARD_STRING provided in <BOARD_NAME>.h. This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- v2: rebase.
board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 1 - 21 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..dcb5c78f55 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
int board_late_init(void) diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfd..679dff7084 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
int dram_init(void) diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 0bf8160f1f..a4e3cccf78 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 574dcda01b..434544d90f 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,7 +468,7 @@ int dram_init(void) }
const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 54e126985b..465be87c01 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 8fa648e40a..45a422044b 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 562be04760..04343a9be6 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 5b1a167906..711baf04c5 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD, };
void reset_cpu(ulong addr) diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index a8de402d20..30be941a44 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
void reset_cpu(ulong addr) diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d681148273..39fefe7fc9 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_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD };
static const struct sh_serial_platdata serial_platdata = { diff --git a/include/configs/alt.h b/include/configs/alt.h index 35518da625..4021910bb3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -12,7 +12,6 @@
#undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
#include "rcar-gen2-common.h"
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 66ae76b2d2..135619ef31 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -11,7 +11,6 @@
#undef DEBUG #define CONFIG_R8A7740 -#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/blanche.h b/include/configs/blanche.h index ce7c716465..7f9cc71af3 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -12,7 +12,6 @@
#undef DEBUG #define CONFIG_R8A7792 -#define CONFIG_RMOBILE_BOARD_STRING "Blanche"
#include "rcar-gen2-common.h"
diff --git a/include/configs/gose.h b/include/configs/gose.h index 610ba1a7ac..c94f7bf252 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -11,7 +11,6 @@
#undef DEBUG #define CONFIG_R8A7793 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
#include "rcar-gen2-common.h"
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b9214d2f34..a0cab809b1 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -11,7 +11,6 @@
#undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
#include "rcar-gen2-common.h"
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 16f37a016d..4eb90db7f2 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,7 +12,6 @@
#define CONFIG_SH73A0 #define CONFIG_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 291b03c50b..162828b787 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -12,7 +12,6 @@
#undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
#include "rcar-gen2-common.h"
diff --git a/include/configs/porter.h b/include/configs/porter.h index 451d9dd66f..a479566146 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -13,7 +13,6 @@
#undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
#include "rcar-gen2-common.h"
diff --git a/include/configs/silk.h b/include/configs/silk.h index 0384325cb5..60a51dc282 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -13,7 +13,6 @@
#undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
#include "rcar-gen2-common.h"
diff --git a/include/configs/stout.h b/include/configs/stout.h index 9422c042f3..b5de336aa1 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -14,7 +14,6 @@
#undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
#include "rcar-gen2-common.h"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c2fe81e552..1a9403a8d1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,6 @@ CONFIG_ARCH_ORION5X CONFIG_ARCH_PLEB CONFIG_ARCH_PXA_CERF CONFIG_ARCH_PXA_IDP -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- v2: no change.
board/atmark-techno/armadillo-800eva/Kconfig | 2 ++ board/kmc/kzm9g/Kconfig | 3 +++ board/renesas/alt/Kconfig | 4 ++++ board/renesas/blanche/Kconfig | 4 ++++ board/renesas/gose/Kconfig | 4 ++++ board/renesas/koelsch/Kconfig | 4 ++++ board/renesas/lager/Kconfig | 4 ++++ board/renesas/porter/Kconfig | 4 ++++ board/renesas/silk/Kconfig | 4 ++++ board/renesas/stout/Kconfig | 4 ++++ include/configs/alt.h | 6 ------ include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 2 -- include/configs/gose.h | 6 ------ include/configs/koelsch.h | 6 ------ include/configs/kzm9g.h | 1 - include/configs/lager.h | 6 ------ include/configs/porter.h | 6 ------ include/configs/silk.h | 6 ------ include/configs/stout.h | 6 ------ 20 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig index cd37dd4861..68ee5efa93 100644 --- a/board/atmark-techno/armadillo-800eva/Kconfig +++ b/board/atmark-techno/armadillo-800eva/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "armadillo-800eva"
+config SYS_TEXT_BASE + default 0xE80C0000 endif diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig index f163efd989..7d7e6ac244 100644 --- a/board/kmc/kzm9g/Kconfig +++ b/board/kmc/kzm9g/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kzm9g"
+config SYS_TEXT_BASE + default 0x00000000 + endif diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..a7ed87ecf0 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,6 +9,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + config R8A7794_ETHERNET_B bool "Use ethernet B function" depends on TARGET_ALT diff --git a/board/renesas/blanche/Kconfig b/board/renesas/blanche/Kconfig index ac4730a62f..ed72638870 100644 --- a/board/renesas/blanche/Kconfig +++ b/board/renesas/blanche/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "blanche"
+config SYS_TEXT_BASE + default 0x00000000 if MTD_NOR_FLASH + default 0x40000000 + endif diff --git a/board/renesas/gose/Kconfig b/board/renesas/gose/Kconfig index 930a44559e..5111507dbd 100644 --- a/board/renesas/gose/Kconfig +++ b/board/renesas/gose/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gose"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig index 6475f02b66..503da62284 100644 --- a/board/renesas/koelsch/Kconfig +++ b/board/renesas/koelsch/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "koelsch"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig index e990c2019c..0a5e86ded6 100644 --- a/board/renesas/lager/Kconfig +++ b/board/renesas/lager/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lager"
+config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/board/renesas/porter/Kconfig b/board/renesas/porter/Kconfig index a6f621b73f..b9ed2f7308 100644 --- a/board/renesas/porter/Kconfig +++ b/board/renesas/porter/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "porter"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/silk/Kconfig b/board/renesas/silk/Kconfig index 07aee0e50f..56b1faa742 100644 --- a/board/renesas/silk/Kconfig +++ b/board/renesas/silk/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "silk"
+config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/stout/Kconfig b/board/renesas/stout/Kconfig index cbbc6dd9e4..06a0d26a2d 100644 --- a/board/renesas/stout/Kconfig +++ b/board/renesas/stout/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stout"
+config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/include/configs/alt.h b/include/configs/alt.h index 4021910bb3..d1bb984984 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -15,12 +15,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 135619ef31..ca058bf1a1 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -#define CONFIG_SYS_TEXT_BASE 0xE80C0000
/* FLASH */ #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 7f9cc71af3..ee5143cb87 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -38,12 +38,10 @@
/* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH) -#define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else -#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/gose.h b/include/configs/gose.h index c94f7bf252..2f171d358b 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -14,12 +14,6 @@
#include "rcar-gen2-common.h"
-#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_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index a0cab809b1..89680b7c8d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -14,12 +14,6 @@
#include "rcar-gen2-common.h"
-#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_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 4eb90db7f2..25e2f79c92 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -67,7 +67,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
-#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_STANDALONE_LOAD_ADDR 0x41000000
/* FLASH */ diff --git a/include/configs/lager.h b/include/configs/lager.h index 162828b787..f7ea95fce6 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -15,12 +15,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC diff --git a/include/configs/porter.h b/include/configs/porter.h index a479566146..a966cf3c76 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -16,12 +16,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/silk.h b/include/configs/silk.h index 60a51dc282..18c53e6b8c 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -16,12 +16,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/stout.h b/include/configs/stout.h index b5de336aa1..92b9f85f92 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -17,12 +17,6 @@
#include "rcar-gen2-common.h"
-#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- v2: no change.
arch/arm/mach-rmobile/Kconfig.32 | 31 +++++++++++++++++++++++++++++++ include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 7 ------- 11 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 49d6206ac2..2b50163783 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,52 +1,83 @@ if RCAR_32
+config R8A7740 + bool + +config R8A7790 + bool + +config R8A7791 + bool + +config R8A7792 + bool + +config R8A7793 + bool + +config R8A7794 + bool + +config SH73A0 + bool + choice prompt "Renesas ARM SoCs board select" optional
config TARGET_ARMADILLO_800EVA bool "armadillo 800 eva board" + select R8A7740
config TARGET_BLANCHE bool "Blanche board" + select R8A7792 select DM select DM_SERIAL
config TARGET_GOSE bool "Gose board" + select R8A7793 select DM select DM_SERIAL
config TARGET_KOELSCH bool "Koelsch board" + select R8A7791 select DM select DM_SERIAL
config TARGET_LAGER bool "Lager board" + select R8A7790 select DM select DM_SERIAL
config TARGET_KZM9G bool "KZM9D board" + select SH73A0
config TARGET_ALT bool "Alt board" + select R8A7794 select DM select DM_SERIAL
config TARGET_SILK bool "Silk board" + select R8A7794 select DM select DM_SERIAL
config TARGET_PORTER bool "Porter board" + select R8A7791 select DM select DM_SERIAL
config TARGET_STOUT bool "Stout board" + select R8A7790 select DM select DM_SERIAL
diff --git a/include/configs/alt.h b/include/configs/alt.h index d1bb984984..788368b959 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H
#undef DEBUG -#define CONFIG_R8A7794
#include "rcar-gen2-common.h"
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index ca058bf1a1..4686f879bf 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -10,7 +10,6 @@ #define __ARMADILLO_800EVA_H
#undef DEBUG -#define CONFIG_R8A7740 #define CONFIG_SH_GPIO_PFC
#include <asm/arch/rmobile.h> diff --git a/include/configs/gose.h b/include/configs/gose.h index 2f171d358b..4abd9777f9 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H
#undef DEBUG -#define CONFIG_R8A7793
#include "rcar-gen2-common.h"
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 89680b7c8d..d8a670c48d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H
#undef DEBUG -#define CONFIG_R8A7791
#include "rcar-gen2-common.h"
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 25e2f79c92..aecea73a00 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -10,7 +10,6 @@
#undef DEBUG
-#define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
diff --git a/include/configs/lager.h b/include/configs/lager.h index f7ea95fce6..cb4c38027c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H
#undef DEBUG -#define CONFIG_R8A7790
#include "rcar-gen2-common.h"
diff --git a/include/configs/porter.h b/include/configs/porter.h index a966cf3c76..52b27c7537 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H
#undef DEBUG -#define CONFIG_R8A7791
#include "rcar-gen2-common.h"
diff --git a/include/configs/silk.h b/include/configs/silk.h index 18c53e6b8c..c04f743520 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H
#undef DEBUG -#define CONFIG_R8A7794
#include "rcar-gen2-common.h"
diff --git a/include/configs/stout.h b/include/configs/stout.h index 92b9f85f92..dadee2d58c 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H
#undef DEBUG -#define CONFIG_R8A7790
#include "rcar-gen2-common.h"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1a9403a8d1..d594c0e137 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1784,12 +1784,6 @@ CONFIG_R8A66597_BASE_ADDR CONFIG_R8A66597_ENDIAN CONFIG_R8A66597_LDRV CONFIG_R8A66597_XTAL -CONFIG_R8A7740 -CONFIG_R8A7790 -CONFIG_R8A7791 -CONFIG_R8A7792 -CONFIG_R8A7793 -CONFIG_R8A7794 CONFIG_RAMBOOT CONFIG_RAMBOOTCOMMAND CONFIG_RAMBOOTCOMMAND_TFTP @@ -1954,7 +1948,6 @@ CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED CONFIG_SGI_IP28 CONFIG_SH4_PCI -CONFIG_SH73A0 CONFIG_SH7751_PCI CONFIG_SH7752EVB CONFIG_SH7753EVB
participants (1)
-
Nobuhiro Iwamatsu