Merge branch 'master' of git://git.denx.de/u-boot-nds32

[u-boot] / arch / arm / mach-rmobile / Kconfig

diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index 5915768928f97adc57fe934c060507f335cd50a3..4b05d78839c67342110614e416efde0d7da21356 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,90 +1,20 @@
 if ARCH_RMOBILE
 
 choice
-       prompt "Renesus ARM SoCs board select"
-       optional
+       prompt "Target Renesas SoC select"
+       default RCAR_32
 
-config TARGET_ARMADILLO_800EVA
-       bool "armadillo 800 eva board"
+config RCAR_32
+       bool "Renesas ARM SoCs R-Car Gen1/Gen2 (32bit)"
+       select CPU_V7
 
-config TARGET_GOSE
-       bool "Gose board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_KOELSCH
-       bool "Koelsch board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_LAGER
-       bool "Lager board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_KZM9G
-       bool "KZM9D board"
-
-config TARGET_ALT
-       bool "Alt board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_SILK
-       bool "Silk board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_PORTER
-       bool "Porter board"
-       select DM
-       select DM_SERIAL
-
-config TARGET_STOUT
-       bool "Stout board"
-       select DM
-       select DM_SERIAL
-
-endchoice
-
-config SYS_SOC
-       default "rmobile"
-
-config RMOBILE_EXTRAM_BOOT
-       bool "Enable boot from RAM"
-       depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK || TARGET_STOUT
-       default n
-
-choice
-       prompt "Qos setting primary"
-       depends on TARGET_ALT || TARGET_GOSE || TARGET_KOELSCH || TARGET_LAGER
-       default QOS_PRI_NORMAL
-
-config QOS_PRI_NORMAL
-       bool "Non primary"
-       help
-          Select normal mode for QoS setting.
-
-config QOS_PRI_MEDIA
-       bool "Media primary"
-       help
-          Select multimedia primary mode for QoS setting.
-
-config QOS_PRI_GFX
-       bool "GFX primary"
-       help
-          Select GFX(graphics) primary mode for QoS setting.
+config RCAR_GEN3
+       bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
+       select ARM64
 
 endchoice
 
-source "board/atmark-techno/armadillo-800eva/Kconfig"
-source "board/renesas/gose/Kconfig"
-source "board/renesas/koelsch/Kconfig"
-source "board/renesas/lager/Kconfig"
-source "board/kmc/kzm9g/Kconfig"
-source "board/renesas/alt/Kconfig"
-source "board/renesas/silk/Kconfig"
-source "board/renesas/porter/Kconfig"
-source "board/renesas/stout/Kconfig"
+source "arch/arm/mach-rmobile/Kconfig.32"
+source "arch/arm/mach-rmobile/Kconfig.64"
 
 endif