Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
Changes in v2: - Rebase again
arch/arm/Kconfig | 8 ++++++++ arch/arm/cpu/armv8/Kconfig | 6 ++++++ board/armltd/vexpress64/Kconfig | 3 --- board/freescale/ls2085a/Kconfig | 6 ------ configs/ls2085a_emu_D4_defconfig | 2 +- configs/ls2085a_emu_defconfig | 2 +- configs/ls2085a_simu_defconfig | 2 +- configs/vexpress_aemv8a_defconfig | 1 - configs/vexpress_aemv8a_semi_defconfig | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 arch/arm/cpu/armv8/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 88c7eaa..aaf800f 100644 --- 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 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 939e6ad..7ebea63 100644 --- 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 798b491..f51afc8 100644 --- 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 f2f6882..0bc36ed 100644 --- 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 51ffa56..a2efec3 100644 --- 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 efa8e74..7563a75 100644 --- 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 a335abc..9e0a175 100644 --- 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 24b868c..8fdf4e0 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_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP" CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A=y