[U-Boot] [PATCH v2 3/4] vexpress64: kconfig: consolidate CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI

Masahiro Yamada
2014-09-13T18:01:50Z

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>
---

Changes in v2:
- Rebase again

arch/arm/Kconfig | 3 ---
board/armltd/vexpress64/Kconfig | 16 ----------------
configs/vexpress_aemv8a_semi_defconfig | 2 +-
3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8537bb..88c7eaa 100644
--- 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 9494409..939e6ad 100644
--- 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 e6dd8e7..24b868c 100644
--- 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
--
1.9.1