kconfig: armv8: move CONFIG_ARM64 to Kconfig

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 88c7eaa8612d73d743bf64fdc70488af5c226bf8..aaf800fb48caa7ff706a6291a4bb9c24432b51d2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -4,6 +4,9 @@ menu "ARM architecture"
 config SYS_ARCH
        default "arm"
 
+config ARM64
+       bool
+
 choice
        prompt "Target select"
 
@@ -459,12 +462,15 @@ config TEGRA
 
 config TARGET_VEXPRESS_AEMV8A
        bool "Support vexpress_aemv8a"
+       select ARM64
 
 config TARGET_LS2085A_EMU
        bool "Support ls2085a_emu"
+       select ARM64
 
 config TARGET_LS2085A_SIMU
        bool "Support ls2085a_simu"
+       select ARM64
 
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds_nor"
@@ -513,6 +519,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv8/Kconfig"
+
 source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"

diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
new file mode 100644 (file)
index 0000000..3d1655b
--- /dev/null
+++ b/arch/arm/cpu/armv8/Kconfig
@@ -0,0 +1,6 @@
+if ARM64
+
+config SYS_CPU
+       default "armv8"
+
+endif

diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 939e6ad1f8ce380f5c3ca0eac9fbe857d18d4b68..7ebea6317f70f320928a9d7705bfed878330a10f 100644 (file)
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_VEXPRESS_AEMV8A
 
-config SYS_CPU
-       default "armv8"
-
 config SYS_BOARD
        default "vexpress64"
 

diff --git a/board/freescale/ls2085a/Kconfig b/board/freescale/ls2085a/Kconfig
index 798b491dcc415ee80062e87907deaf995cd6e035..f51afc8234422a576b314dcedd4e4d6b7674e03f 100644 (file)
--- a/board/freescale/ls2085a/Kconfig
+++ b/board/freescale/ls2085a/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_LS2085A_EMU
 
-config SYS_CPU
-       default "armv8"
-
 config SYS_BOARD
        default "ls2085a"
 
@@ -19,9 +16,6 @@ endif
 
 if TARGET_LS2085A_SIMU
 
-config SYS_CPU
-       default "armv8"
-
 config SYS_BOARD
        default "ls2085a"
 

diff --git a/configs/ls2085a_emu_D4_defconfig b/configs/ls2085a_emu_D4_defconfig
index f2f6882c999426014cadadeccd239d85f74331f3..0bc36ed0b03006069de2d2e3a66c6580da2c27ea 100644 (file)
--- a/configs/ls2085a_emu_D4_defconfig
+++ b/configs/ls2085a_emu_D4_defconfig
@@ -1,3 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="ARM64,EMU,SYS_FSL_DDR4"
+CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4"
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_EMU=y

diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig
index 51ffa56a4c4327503a1b1be91df17ec5ea50c2e4..a2efec3ccf785c17f85f515f0bbf885a61e13d1d 100644 (file)
--- a/configs/ls2085a_emu_defconfig
+++ b/configs/ls2085a_emu_defconfig
@@ -1,3 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="ARM64,EMU"
+CONFIG_SYS_EXTRA_OPTIONS="EMU"
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_EMU=y

diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig
index efa8e7454882e0f38dee262305fc122947ba4dfb..7563a7546e2c9630609116d4a2b62339630653c9 100644 (file)
--- a/configs/ls2085a_simu_defconfig
+++ b/configs/ls2085a_simu_defconfig
@@ -1,3 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="ARM64,SIMU"
+CONFIG_SYS_EXTRA_OPTIONS="SIMU"
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_SIMU=y

diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig
index a335abcf78a32a5333d9b4545c9d9e2ccde7cf9f..9e0a1755a0cb9bc30c106ee483313990a3f1b495 100644 (file)
--- a/configs/vexpress_aemv8a_defconfig
+++ b/configs/vexpress_aemv8a_defconfig
@@ -1,3 +1,2 @@
-CONFIG_SYS_EXTRA_OPTIONS="ARM64"
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_AEMV8A=y

diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 24b868c68ea87f5859e31885157244a874e9e0f6..8fdf4e0fabcb3ecdeb3da1509530cd22ca2c7082 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_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP"
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_AEMV8A=y