ARM: rmobile: Introduce CONFIG_RCAR_64 symbol

Introduce common Kconfig symbol for 64bit R-Car platforms and move
common configuration options into it. This is preparatory patch to
prevent duplication of Kconfig lists later on, when Gen4 is added.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index b69ccaee0a030bf36d530768bde8c84991e403d9..921153a8d9ebc1142f450e73b7e1749e966d96a6 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,15 +1,8 @@
 if ARCH_RMOBILE
 
-choice
-       prompt "Target Renesas SoC select"
-       default RCAR_32
-
-config RCAR_32
-       bool "Renesas ARM SoCs R-Car Gen1/Gen2 (32bit)"
-       select CPU_V7A
-
-config RCAR_GEN3
-       bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
+# Renesas ARM SoCs R-Car Gen3/Gen4 (64bit)
+config RCAR_64
+       bool
        select ARM64
        select CMD_CACHE
        select OF_BOARD_SETUP
@@ -18,11 +11,24 @@ config RCAR_GEN3
        select PINCTRL
        select PINCTRL_PFC
        select POSITION_INDEPENDENT
-       select SUPPORT_SPL
        imply CMD_FS_UUID
        imply CMD_GPT
        imply CMD_MMC_SWRITE if MMC
        imply CMD_UUID
+       imply SUPPORT_EMMC_RPMB if MMC
+
+choice
+       prompt "Target Renesas SoC select"
+       default RCAR_32
+
+config RCAR_32
+       bool "Renesas ARM SoCs R-Car Gen1/Gen2 (32bit)"
+       select CPU_V7A
+
+config RCAR_GEN3
+       bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
+       select RCAR_64
+       select SUPPORT_SPL
        imply SPL
        imply SPL_BOARD_INIT
        imply SPL_GZIP
@@ -33,7 +39,6 @@ config RCAR_GEN3
        imply SPL_TINY_MEMSET
        imply SPL_USE_TINY_PRINTF
        imply SPL_YMODEM_SUPPORT
-       imply SUPPORT_EMMC_RPMB if MMC
 
 config RZA1
        prompt "Renesas ARM SoCs RZ/A1 (32bit)"