From: Simon Glass <sjg@chromium.org> This name matches the ARM name and 'emulation' is not really a vendor. Use ARCH_QEMU_X86 instead, moving that option from its existing location. In the few cases where both ARCH_QEMU_X86 and ARCH_QEMU_ARM are used together, use MACH_QEMU since it is simpler. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/Kconfig | 14 ++++++++++++-- arch/x86/cpu/qemu/Kconfig | 12 ------------ board/emulation/Kconfig | 2 +- board/emulation/qemu-x86/Kconfig | 1 - fs/Kconfig | 6 +++--- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f06f7a9d4da..df1b706ccf7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -59,7 +59,7 @@ config SPL_X86_64 choice prompt "Mainboard vendor" - default VENDOR_EMULATION + default ARCH_QEMU_X86 config VENDOR_ADVANTECH bool "advantech" @@ -77,8 +77,18 @@ config ARCH_EFI_X86 bool "efi" select ARCH_EFI -config VENDOR_EMULATION +config ARCH_QEMU_X86 bool "emulation" + select MACH_QEMU + select ARCH_EARLY_INIT_R + imply AHCI_PCI + imply E1000 + imply SCSI + imply SCSI_AHCI + imply SYS_NS16550 + imply USB + imply USB_EHCI_HCD + imply VIDEO_VESA config VENDOR_GOOGLE bool "Google" diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index 03b96ce9e59..76f847fffef 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -2,18 +2,6 @@ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -config ARCH_QEMU_X86 - bool - select ARCH_EARLY_INIT_R - imply AHCI_PCI - imply E1000 - imply SCSI - imply SCSI_AHCI - imply SYS_NS16550 - imply USB - imply USB_EHCI_HCD - imply VIDEO_VESA - if ARCH_QEMU_X86 config SYS_CAR_ADDR diff --git a/board/emulation/Kconfig b/board/emulation/Kconfig index f821458fa6a..07b8274d749 100644 --- a/board/emulation/Kconfig +++ b/board/emulation/Kconfig @@ -2,7 +2,7 @@ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -if VENDOR_EMULATION +if ARCH_QEMU_X86 choice prompt "Mainboard model" diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig index c9b6ee37719..b7b13101f2e 100644 --- a/board/emulation/qemu-x86/Kconfig +++ b/board/emulation/qemu-x86/Kconfig @@ -16,7 +16,6 @@ config TEXT_BASE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select X86_RESET_VECTOR - select ARCH_QEMU_X86 select QFW_PIO if CMD_QFW select BOARD_ROMSIZE_KB_1024 if TARGET_QEMU_X86 select BOARD_ROMSIZE_KB_2048 if TARGET_QEMU_X86_64 diff --git a/fs/Kconfig b/fs/Kconfig index 377ab09a285..b73d53dd3a3 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -6,7 +6,7 @@ menu "File systems" config FS bool "Support for filesystems" - default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM + default y if SANDBOX || ARCH_QEMU_X86 || ARCH_QEMU_ARM depends on EXPERT help Provides an interface for filesystems, allowing them to be @@ -15,14 +15,14 @@ config FS config DIR bool "Support for directories" depends on FS - default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM + default y if SANDBOX || ARCH_QEMU_X86 || ARCH_QEMU_ARM help Provides an interface for directories within filesystems, allowing them to be listed. config FILE bool "Support for files" - default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM + default y if SANDBOX || ARCH_QEMU_X86 || ARCH_QEMU_ARM help Provides an interface for files, allowing them to be opened, read, written and modified. Files are children of a filesystem device -- 2.43.0