vexpress64: kconfig: consolidate CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI

We do not have to distinguish CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI
from CONFIG_TARGET_VEXPRESS_AEMV8A.  Rename the former to the latter.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Steve Rae <srae@broadcom.com>
Cc: David Feng <fenghua@phytium.com.cn>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8537bbe88047f7fefc5ca6700fb72bfdefbff13..88c7eaa8612d73d743bf64fdc70488af5c226bf8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -460,9 +460,6 @@ config TEGRA
 config TARGET_VEXPRESS_AEMV8A
        bool "Support vexpress_aemv8a"
 
-config TARGET_VEXPRESS_AEMV8A_SEMI
-       bool "Support vexpress_aemv8a_semi"
-
 config TARGET_LS2085A_EMU
        bool "Support ls2085a_emu"
 

diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 94944095c3f87cfc5177073688ce1a5e9eabcb1d..939e6ad1f8ce380f5c3ca0eac9fbe857d18d4b68 100644 (file)
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -13,19 +13,3 @@ config SYS_CONFIG_NAME
        default "vexpress_aemv8a"
 
 endif
-
-if TARGET_VEXPRESS_AEMV8A_SEMI
-
-config SYS_CPU
-       default "armv8"
-
-config SYS_BOARD
-       default "vexpress64"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "vexpress_aemv8a"
-
-endif

diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index e6dd8e72248e1ce016ce48fdba41504eeddb5920..24b868c68ea87f5859e31885157244a874e9e0f6 100644 (file)
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARM64,SEMIHOSTING,BASE_FVP"
 CONFIG_ARM=y
-CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI=y
+CONFIG_TARGET_VEXPRESS_AEMV8A=y