From: Simon Glass <sjg@chromium.org> Set up a single place in Kconfig where board/emulation/Kconfig is included, removing the two sites in arch/arm and arch/x86 Move the ARM-specific Kconfig into this file. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/Kconfig | 2 + arch/arm/Kconfig | 2 - arch/arm/mach-qemu/Kconfig | 72 ------------------------------------ arch/x86/Kconfig | 1 - board/emulation/Kconfig | 76 +++++++++++++++++++++++++++++++++++++- 5 files changed, 77 insertions(+), 76 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 9c357b58d44..49ab4f825d8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -573,3 +573,5 @@ config MACH_QEMU help This should enabled for all QEMU targets, on all architectures. It controls features which are particular to running U-Boot on QEMU. + +source "board/emulation/Kconfig" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6239e117d31..e31d368b513 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2325,8 +2325,6 @@ source "arch/arm/mach-meson/Kconfig" source "arch/arm/mach-mediatek/Kconfig" -source "arch/arm/mach-qemu/Kconfig" - source "arch/arm/mach-rockchip/Kconfig" source "arch/arm/mach-s5pc1xx/Kconfig" diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index 2915d3b3837..e69de29bb2d 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -1,72 +0,0 @@ -if ARCH_QEMU_ARM - -config SYS_VENDOR - default "emulation" - -choice - prompt "QEMU ARM architecture" - default TARGET_QEMU_ARM_64BIT - -config TARGET_QEMU_ARM_32BIT - bool "ARMv7-A, 32bit" - select ARCH_SUPPORT_PSCI - select BOARD_LATE_INIT - select CPU_V7A - select SYS_ARCH_TIMER - -config TARGET_QEMU_ARM_32BIT_SPL - bool "ARMv7-A, 32bit with SPL" - select ARCH_SUPPORT_PSCI - select BOARD_LATE_INIT - select CPU_V7A - select SYS_ARCH_TIMER - select SPL - select BINMAN - -config TARGET_QEMU_ARM_64BIT - bool "ARMv8, 64bit" - select ARM64 - select BOARD_LATE_INIT - -config TARGET_QEMU_ARM_SBSA - bool "SBSA Reference" - select ARM64 - select BINMAN - select BOARD_LATE_INIT - select ENABLE_ARM_SOC_BOOT0_HOOK - select MISC_INIT_R - -config TARGET_QEMU_ARM_64BIT_SPL - bool "ARMv8, 64bit with SPL" - select ARM64 - select BOARD_LATE_INIT - select SPL - select BINMAN - -endchoice - -if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \ - TARGET_QEMU_ARM_32BIT_SPL || TARGET_QEMU_ARM_64BIT_SPL - -config SYS_BOARD - default "qemu-arm" - -config SYS_CONFIG_NAME - default "qemu-arm" - -endif - -if TARGET_QEMU_ARM_SBSA - -config SYS_BOARD - default "qemu-sbsa" - -config SYS_CONFIG_NAME - default "qemu-sbsa" - -config SYS_SOC - default "qemu-sbsa" - -endif - -endif diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index df1b706ccf7..c29b5781a98 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -119,7 +119,6 @@ source "board/advantech/Kconfig" source "board/congatec/Kconfig" source "board/coreboot/Kconfig" source "board/dfi/Kconfig" -source "board/emulation/Kconfig" source "board/google/Kconfig" source "board/intel/Kconfig" diff --git a/board/emulation/Kconfig b/board/emulation/Kconfig index 07b8274d749..e88375a2653 100644 --- a/board/emulation/Kconfig +++ b/board/emulation/Kconfig @@ -2,6 +2,80 @@ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> +if ARCH_QEMU_ARM + +config SYS_VENDOR + default "emulation" + +choice + prompt "QEMU ARM architecture" + default TARGET_QEMU_ARM_64BIT + +config TARGET_QEMU_ARM_32BIT + bool "ARMv7-A, 32bit" + select ARCH_SUPPORT_PSCI + select BOARD_LATE_INIT + select CPU_V7A + select SYS_ARCH_TIMER + +config TARGET_QEMU_ARM_32BIT_SPL + bool "ARMv7-A, 32bit with SPL" + select ARCH_SUPPORT_PSCI + select BOARD_LATE_INIT + select CPU_V7A + select SYS_ARCH_TIMER + select SPL + select BINMAN + +config TARGET_QEMU_ARM_64BIT + bool "ARMv8, 64bit" + select ARM64 + select BOARD_LATE_INIT + +config TARGET_QEMU_ARM_SBSA + bool "SBSA Reference" + select ARM64 + select BINMAN + select BOARD_LATE_INIT + select ENABLE_ARM_SOC_BOOT0_HOOK + select MISC_INIT_R + +config TARGET_QEMU_ARM_64BIT_SPL + bool "ARMv8, 64bit with SPL" + select ARM64 + select BOARD_LATE_INIT + select SPL + select BINMAN + +endchoice + +if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \ + TARGET_QEMU_ARM_32BIT_SPL || TARGET_QEMU_ARM_64BIT_SPL + +config SYS_BOARD + default "qemu-arm" + +config SYS_CONFIG_NAME + default "qemu-arm" + +endif + +if TARGET_QEMU_ARM_SBSA + +config SYS_BOARD + default "qemu-sbsa" + +config SYS_CONFIG_NAME + default "qemu-sbsa" + +config SYS_SOC + default "qemu-sbsa" + +endif + +endif # ARCH_QEMU_ARM + + if ARCH_QEMU_X86 choice @@ -27,4 +101,4 @@ endchoice source "board/emulation/qemu-x86/Kconfig" -endif +endif # ARCH_QEMU_X86 -- 2.43.0