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

[u-boot] / board / armltd / vexpress64 / Kconfig

diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 91eb8d2997bf2ebde776f30f2d89a8cedcb81b53..7d5e7bee8b9a9c4c9a9bfc0280a898e9dfff6986 100644 (file)
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -1,39 +1,38 @@
-if TARGET_VEXPRESS_AEMV8A
-
-config SYS_CPU
-       string
-       default "armv8"
+if TARGET_VEXPRESS64_AEMV8A
 
 config SYS_BOARD
-       string
        default "vexpress64"
 
 config SYS_VENDOR
-       string
        default "armltd"
 
 config SYS_CONFIG_NAME
-       string
        default "vexpress_aemv8a"
 
 endif
 
-if TARGET_VEXPRESS_AEMV8A_SEMI
+if TARGET_VEXPRESS64_BASE_FVP
+
+config SYS_BOARD
+       default "vexpress64"
+
+config SYS_VENDOR
+       default "armltd"
+
+config SYS_CONFIG_NAME
+       default "vexpress_aemv8a"
+
+endif
 
-config SYS_CPU
-       string
-       default "armv8"
+if TARGET_VEXPRESS64_JUNO
 
 config SYS_BOARD
-       string
        default "vexpress64"
 
 config SYS_VENDOR
-       string
        default "armltd"
 
 config SYS_CONFIG_NAME
-       string
        default "vexpress_aemv8a"
 
 endif