summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-30 22:10:58 (GMT)
committerTom Rini <trini@ti.com>2014-08-31 01:19:32 (GMT)
commitad17a81c0627537e022967628410cd12dd781b53 (patch)
tree9f0537777235fb5f80f7543dca5215c3550fe0cc /arch
parentf40b98986384373e03e0b2f19833c3e65e452fdb (diff)
downloadu-boot-ad17a81c0627537e022967628410cd12dd781b53.tar.xz
versatile: kconfig: move common settings
Move Versatile-specific settings to versatile/Kconfig. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig13
-rw-r--r--arch/arm/cpu/arm926ejs/versatile/Kconfig23
2 files changed, 27 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 304200e..4e9e26f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -308,14 +308,8 @@ config TARGET_SPEAR600
config TARGET_X600
bool "Support x600"
-config TARGET_VERSATILEAB
- bool "Support versatileab"
-
-config TARGET_VERSATILEPB
- bool "Support versatilepb"
-
-config TARGET_VERSATILEQEMU
- bool "Support versatileqemu"
+config ARCH_VERSATILE
+ bool "ARM Ltd. Versatile family"
config TARGET_INTEGRATORCP_CM1136
bool "Support integratorcp_cm1136"
@@ -720,6 +714,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/tegra-common/Kconfig"
+source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
+
source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig"
@@ -750,7 +746,6 @@ source "board/ait/cam_enc_4xx/Kconfig"
source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig"
source "board/armltd/integrator/Kconfig"
-source "board/armltd/versatile/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/atmel/at91rm9200ek/Kconfig"
diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/cpu/arm926ejs/versatile/Kconfig
new file mode 100644
index 0000000..fc29c98
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/versatile/Kconfig
@@ -0,0 +1,23 @@
+if ARCH_VERSATILE
+
+config SYS_CPU
+ string
+ default "arm926ejs"
+
+config SYS_BOARD
+ string
+ default "versatile"
+
+config SYS_VENDOR
+ string
+ default "armltd"
+
+config SYS_SOC
+ string
+ default "versatile"
+
+config SYS_CONFIG_NAME
+ string
+ default "versatile"
+
+endif