From b606e1bbc3428d0ebc320f11b361e1b79a21a640 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 7 Jan 2018 19:37:06 +0100 Subject: [PATCH] ARM: rmobile: Convert CONFIG_R8A77xx to Kconfig Convert these configuration options to Kconfig, update board defconfigs and drop them from whitelist. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- arch/arm/mach-rmobile/Kconfig.32 | 26 ++++++++++++++++++++++++++ configs/alt_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/blanche_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/stout_defconfig | 1 + 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/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 6 ------ 20 files changed, 35 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 49d6206ac2..ab05966d15 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,5 +1,31 @@ if RCAR_32 +config RCAR_GEN2 + bool "Renesas RCar Gen2" + +config R8A7740 + bool "Renesas SoC R8A7740" + +config R8A7790 + bool "Renesas SoC R8A7790" + select RCAR_GEN2 + +config R8A7791 + bool "Renesas SoC R8A7791" + select RCAR_GEN2 + +config R8A7792 + bool "Renesas SoC R8A7792" + select RCAR_GEN2 + +config R8A7793 + bool "Renesas SoC R8A7793" + select RCAR_GEN2 + +config R8A7794 + bool "Renesas SoC R8A7794" + select RCAR_GEN2 + choice prompt "Renesas ARM SoCs board select" optional diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 157d830ff1..886caac035 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7794=y CONFIG_TARGET_ALT=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 14d6c843ae..cade19e6cb 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y +CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 500ebc6983..37822cdeae 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 5f10d9a304..88ef894788 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index acc7289139..dad4ceb5c2 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index c0778ee824..f1b11cc7b3 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 7374a30ed2..65ff3c0a47 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index ffe1d8b784..14f427cd3a 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7794=y CONFIG_TARGET_SILK=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 6750dcdd79..9f57c2624e 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y diff --git a/include/configs/alt.h b/include/configs/alt.h index e35ddc8ed8..84fc705a04 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H #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 94aecb7de1..cade5bb3a0 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_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" #define CONFIG_SH_GPIO_PFC diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ce7c716465..4948bbb063 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -11,7 +11,6 @@ #define __BLANCHE_H #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 fab0edd5e6..dcd2130080 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H #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 c449e43f95..f1571a4576 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H #undef DEBUG -#define CONFIG_R8A7791 #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" #include "rcar-gen2-common.h" diff --git a/include/configs/lager.h b/include/configs/lager.h index 000e5cd8f3..53b717f260 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H #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 10dce6b476..f7cf7181df 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H #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 79a4f06c0b..0ece76f799 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H #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 789f364168..0a02216cd5 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H #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 6be4a76df3..fa310c15da 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1725,12 +1725,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