ARM: rmobile: Split R-Car Gen3 into separate Kconfig from common 64bit options
There are multiple shared Kconfig options between R-Car Gen3 and Gen4.
Keep the common options in Kconfig.64 and move the R-Car Gen3 specific
options into separate Kconfig.rcar3 . The Kconfig.rcar3 contains SoC
and board list, which is limited to R-Car Gen3.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 3ed5099..3b14721 100644
--- a/arch/arm/mach-rmobile/Kconfig.64
+++ b/arch/arm/mach-rmobile/Kconfig.64
@@ -1,207 +1,11 @@
-if RCAR_GEN3
-
-menu "Select Target SoC"
-
-config R8A774A1
- bool "Renesas SoC R8A774A1"
- select GICV2
- imply CLK_R8A774A1
- imply PINCTRL_PFC_R8A774A1
-
-config R8A774B1
- bool "Renesas SoC R8A774B1"
- select GICV2
- imply CLK_R8A774B1
- imply PINCTRL_PFC_R8A774B1
-
-config R8A774C0
- bool "Renesas SoC R8A774C0"
- select GICV2
- imply CLK_R8A774C0
- imply PINCTRL_PFC_R8A774C0
-
-config R8A774E1
- bool "Renesas SoC R8A774E1"
- select GICV2
- imply CLK_R8A774E1
- imply PINCTRL_PFC_R8A774E1
-
-config R8A7795
- bool "Renesas SoC R8A7795"
- select GICV2
- imply CLK_R8A7795
- imply PINCTRL_PFC_R8A77951
-
-config R8A7796
- bool "Renesas SoC R8A7796"
- select GICV2
- imply CLK_R8A77960
- imply CLK_R8A77961
- imply PINCTRL_PFC_R8A77960
- imply PINCTRL_PFC_R8A77961
-
-config R8A77965
- bool "Renesas SoC R8A77965"
- select GICV2
- imply CLK_R8A77965
- imply PINCTRL_PFC_R8A77965
-
-config R8A77970
- bool "Renesas SoC R8A77970"
- select GICV2
- imply CLK_R8A77970
- imply PINCTRL_PFC_R8A77970
-
-config R8A77980
- bool "Renesas SoC R8A77980"
- select GICV2
- imply CLK_R8A77980
- imply PINCTRL_PFC_R8A77980
-
-config R8A77990
- bool "Renesas SoC R8A77990"
- select GICV2
- imply CLK_R8A77990
- imply PINCTRL_PFC_R8A77990
-
-config R8A77995
- bool "Renesas SoC R8A77995"
- select GICV2
- imply CLK_R8A77995
- imply PINCTRL_PFC_R8A77995
-
-config R8A779A0
- bool "Renesas SoC R8A779A0"
- select GICV3
- imply CLK_R8A779A0
- imply PINCTRL_PFC_R8A779A0
-
-config RZ_G2
- bool "Renesas ARM SoCs RZ/G2 (64bit)"
-
-endmenu
-
-choice
- prompt "Renesas ARM64 SoCs board select"
- optional
-
-config TARGET_BEACON_RZG2M
- bool "Beacon EmbeddedWorks RZ/G2 Dev Kit"
- select PINCTRL_PFC_R8A774A1
- select PINCTRL_PFC_R8A774B1
- select PINCTRL_PFC_R8A774E1
- select R8A774A1
- select R8A774B1
- select R8A774E1
- select RZ_G2
- imply CLK_CCF
- imply CLK_VERSACLOCK
- imply MULTI_DTB_FIT
- imply MULTI_DTB_FIT_USER_DEFINED_AREA
-
-config TARGET_CONDOR
- bool "Condor board"
- imply R8A77980
- help
- Support for Renesas R-Car Gen3 Condor platform
-
-config TARGET_DRAAK
- bool "Draak board"
- imply R8A77995
- help
- Support for Renesas R-Car Gen3 Draak platform
-
-config TARGET_EAGLE
- bool "Eagle board"
- imply R8A77970
- help
- Support for Renesas R-Car Gen3 Eagle platform
-
-config TARGET_EBISU
- bool "Ebisu board"
- imply R8A77990
- help
- Support for Renesas R-Car Gen3 Ebisu platform
-
-config TARGET_FALCON
- bool "Falcon board"
- imply R8A779A0
- help
- Support for Renesas R-Car Gen3 Falcon platform
-
-config TARGET_HIHOPE_RZG2
- bool "HiHope RZ/G2 board"
- imply MULTI_DTB_FIT
- imply MULTI_DTB_FIT_USER_DEFINED_AREA
- imply R8A774A1
- imply R8A774B1
- imply R8A774E1
- imply RZ_G2
- imply SYS_MALLOC_F
- help
- Support for RZG2 HiHope platform
-
-config TARGET_SILINUX_EK874
- bool "Silicon Linux EK874 board"
- imply R8A774C0
- imply RZ_G2
- help
- Support for Silicon Linux EK874 platform
-
-config TARGET_SALVATOR_X
- bool "Salvator-X board"
- imply MULTI_DTB_FIT
- imply MULTI_DTB_FIT_USER_DEFINED_AREA
- imply R8A7795
- imply R8A7796
- imply R8A77965
- imply SYS_MALLOC_F
- help
- Support for Renesas R-Car Gen3 platform
-
-config TARGET_ULCB
- bool "ULCB board"
- imply MULTI_DTB_FIT
- imply MULTI_DTB_FIT_USER_DEFINED_AREA
- imply R8A7795
- imply R8A7796
- imply R8A77965
- imply SYS_MALLOC_F
- help
- Support for Renesas R-Car Gen3 ULCB platform
-
-endchoice
-
-source "board/renesas/condor/Kconfig"
-source "board/renesas/draak/Kconfig"
-source "board/renesas/eagle/Kconfig"
-source "board/renesas/ebisu/Kconfig"
-source "board/renesas/falcon/Kconfig"
-source "board/renesas/salvator-x/Kconfig"
-source "board/renesas/ulcb/Kconfig"
-source "board/beacon/beacon-rzg2m/Kconfig"
-source "board/hoperun/hihope-rzg2/Kconfig"
-source "board/silinux/ek874/Kconfig"
-
-config MULTI_DTB_FIT_UNCOMPRESS_SZ
- default 0x80000 if TARGET_BEACON_RZG2M
- default 0x80000 if TARGET_HIHOPE_RZG2
- default 0x80000 if TARGET_SALVATOR_X
- default 0x80000 if TARGET_ULCB
-
-config MULTI_DTB_FIT_USER_DEF_ADDR
- default 0x49000000 if TARGET_BEACON_RZG2M
- default 0x49000000 if TARGET_HIHOPE_RZG2
- default 0x49000000 if TARGET_SALVATOR_X
- default 0x49000000 if TARGET_ULCB
+if RCAR_64
config SYS_MALLOC_F_LEN
- default 0x8000 if RCAR_GEN3
-
-config DM_RESET
- default y if RCAR_GEN3
+ default 0x8000 if RCAR_64
config OF_LIBFDT_OVERLAY
- default y if RCAR_GEN3
+ default y if RCAR_64
+
+source "arch/arm/mach-rmobile/Kconfig.rcar3"
endif
diff --git a/arch/arm/mach-rmobile/Kconfig.rcar3 b/arch/arm/mach-rmobile/Kconfig.rcar3
new file mode 100644
index 0000000..680aa45
--- /dev/null
+++ b/arch/arm/mach-rmobile/Kconfig.rcar3
@@ -0,0 +1,201 @@
+if RCAR_GEN3
+
+menu "Select Target SoC"
+
+config R8A774A1
+ bool "Renesas SoC R8A774A1"
+ select GICV2
+ imply CLK_R8A774A1
+ imply PINCTRL_PFC_R8A774A1
+
+config R8A774B1
+ bool "Renesas SoC R8A774B1"
+ select GICV2
+ imply CLK_R8A774B1
+ imply PINCTRL_PFC_R8A774B1
+
+config R8A774C0
+ bool "Renesas SoC R8A774C0"
+ select GICV2
+ imply CLK_R8A774C0
+ imply PINCTRL_PFC_R8A774C0
+
+config R8A774E1
+ bool "Renesas SoC R8A774E1"
+ select GICV2
+ imply CLK_R8A774E1
+ imply PINCTRL_PFC_R8A774E1
+
+config R8A7795
+ bool "Renesas SoC R8A7795"
+ select GICV2
+ imply CLK_R8A7795
+ imply PINCTRL_PFC_R8A77951
+
+config R8A7796
+ bool "Renesas SoC R8A7796"
+ select GICV2
+ imply CLK_R8A77960
+ imply CLK_R8A77961
+ imply PINCTRL_PFC_R8A77960
+ imply PINCTRL_PFC_R8A77961
+
+config R8A77965
+ bool "Renesas SoC R8A77965"
+ select GICV2
+ imply CLK_R8A77965
+ imply PINCTRL_PFC_R8A77965
+
+config R8A77970
+ bool "Renesas SoC R8A77970"
+ select GICV2
+ imply CLK_R8A77970
+ imply PINCTRL_PFC_R8A77970
+
+config R8A77980
+ bool "Renesas SoC R8A77980"
+ select GICV2
+ imply CLK_R8A77980
+ imply PINCTRL_PFC_R8A77980
+
+config R8A77990
+ bool "Renesas SoC R8A77990"
+ select GICV2
+ imply CLK_R8A77990
+ imply PINCTRL_PFC_R8A77990
+
+config R8A77995
+ bool "Renesas SoC R8A77995"
+ select GICV2
+ imply CLK_R8A77995
+ imply PINCTRL_PFC_R8A77995
+
+config R8A779A0
+ bool "Renesas SoC R8A779A0"
+ select GICV3
+ imply CLK_R8A779A0
+ imply PINCTRL_PFC_R8A779A0
+
+config RZ_G2
+ bool "Renesas ARM SoCs RZ/G2 (64bit)"
+
+endmenu
+
+choice
+ prompt "Renesas ARM64 SoCs board select"
+ optional
+
+config TARGET_BEACON_RZG2M
+ bool "Beacon EmbeddedWorks RZ/G2 Dev Kit"
+ select PINCTRL_PFC_R8A774A1
+ select PINCTRL_PFC_R8A774B1
+ select PINCTRL_PFC_R8A774E1
+ select R8A774A1
+ select R8A774B1
+ select R8A774E1
+ select RZ_G2
+ imply CLK_CCF
+ imply CLK_VERSACLOCK
+ imply MULTI_DTB_FIT
+ imply MULTI_DTB_FIT_USER_DEFINED_AREA
+
+config TARGET_CONDOR
+ bool "Condor board"
+ imply R8A77980
+ help
+ Support for Renesas R-Car Gen3 Condor platform
+
+config TARGET_DRAAK
+ bool "Draak board"
+ imply R8A77995
+ help
+ Support for Renesas R-Car Gen3 Draak platform
+
+config TARGET_EAGLE
+ bool "Eagle board"
+ imply R8A77970
+ help
+ Support for Renesas R-Car Gen3 Eagle platform
+
+config TARGET_EBISU
+ bool "Ebisu board"
+ imply R8A77990
+ help
+ Support for Renesas R-Car Gen3 Ebisu platform
+
+config TARGET_FALCON
+ bool "Falcon board"
+ imply R8A779A0
+ help
+ Support for Renesas R-Car Gen3 Falcon platform
+
+config TARGET_HIHOPE_RZG2
+ bool "HiHope RZ/G2 board"
+ imply MULTI_DTB_FIT
+ imply MULTI_DTB_FIT_USER_DEFINED_AREA
+ imply R8A774A1
+ imply R8A774B1
+ imply R8A774E1
+ imply RZ_G2
+ imply SYS_MALLOC_F
+ help
+ Support for RZG2 HiHope platform
+
+config TARGET_SILINUX_EK874
+ bool "Silicon Linux EK874 board"
+ imply R8A774C0
+ imply RZ_G2
+ help
+ Support for Silicon Linux EK874 platform
+
+config TARGET_SALVATOR_X
+ bool "Salvator-X board"
+ imply MULTI_DTB_FIT
+ imply MULTI_DTB_FIT_USER_DEFINED_AREA
+ imply R8A7795
+ imply R8A7796
+ imply R8A77965
+ imply SYS_MALLOC_F
+ help
+ Support for Renesas R-Car Gen3 platform
+
+config TARGET_ULCB
+ bool "ULCB board"
+ imply MULTI_DTB_FIT
+ imply MULTI_DTB_FIT_USER_DEFINED_AREA
+ imply R8A7795
+ imply R8A7796
+ imply R8A77965
+ imply SYS_MALLOC_F
+ help
+ Support for Renesas R-Car Gen3 ULCB platform
+
+endchoice
+
+source "board/renesas/condor/Kconfig"
+source "board/renesas/draak/Kconfig"
+source "board/renesas/eagle/Kconfig"
+source "board/renesas/ebisu/Kconfig"
+source "board/renesas/falcon/Kconfig"
+source "board/renesas/salvator-x/Kconfig"
+source "board/renesas/ulcb/Kconfig"
+source "board/beacon/beacon-rzg2m/Kconfig"
+source "board/hoperun/hihope-rzg2/Kconfig"
+source "board/silinux/ek874/Kconfig"
+
+config MULTI_DTB_FIT_UNCOMPRESS_SZ
+ default 0x80000 if TARGET_BEACON_RZG2M
+ default 0x80000 if TARGET_HIHOPE_RZG2
+ default 0x80000 if TARGET_SALVATOR_X
+ default 0x80000 if TARGET_ULCB
+
+config MULTI_DTB_FIT_USER_DEF_ADDR
+ default 0x49000000 if TARGET_BEACON_RZG2M
+ default 0x49000000 if TARGET_HIHOPE_RZG2
+ default 0x49000000 if TARGET_SALVATOR_X
+ default 0x49000000 if TARGET_ULCB
+
+config DM_RESET
+ default y if RCAR_GEN3
+
+endif