From: Simon Glass <sjg@chromium.org> At present ARM and x86 use differently named symbols to mean similar things. For x86, board/emulation/Kconfig contains the targets, but ARM has them in a different file. While ARM uses ARCH_QEMU to mean QEMU, x86 uses VENDOR_EMULATION. This series adjusts the Kconfig for emulation targets on x86 and ARM, to improve consistency. A new arch-neutral MACH_QEMU is introduced. This is enabled for all ARM/x86 emulation targets. Furture work could add this for other archs too. Simon Glass (6): emulation: x86: Rename VENDOR_EMULATION to ARCH_QEMU_X86 arm: x86: Move Kconfig from arch/ to board/ arm: Move inclusion of board/emulation into board/ emulation: Move QFW drivers to drivers/qfw emulation: Rename the uclass file to qfw-uclass.c emulation: Move common qfw file in with other code arch/Kconfig | 2 + arch/arm/Kconfig | 4 -- arch/arm/mach-qemu/Kconfig | 72 --------------------- arch/x86/Kconfig | 15 ++++- arch/x86/cpu/qemu/Kconfig | 12 ---- board/emulation/Kconfig | 81 +++++++++++++++++++++++- board/emulation/qemu-x86/Kconfig | 1 - common/Makefile | 2 - drivers/Makefile | 1 + drivers/misc/Makefile | 8 --- drivers/qfw/Makefile | 13 ++++ drivers/{misc/qfw.c => qfw/qfw-uclass.c} | 0 {common => drivers/qfw}/qfw.c | 0 drivers/{misc => qfw}/qfw_acpi.c | 0 drivers/{misc => qfw}/qfw_mmio.c | 0 drivers/{misc => qfw}/qfw_pio.c | 0 drivers/{misc => qfw}/qfw_sandbox.c | 0 drivers/{misc => qfw}/qfw_smbios.c | 0 fs/Kconfig | 6 +- 19 files changed, 110 insertions(+), 107 deletions(-) create mode 100644 drivers/qfw/Makefile rename drivers/{misc/qfw.c => qfw/qfw-uclass.c} (100%) rename {common => drivers/qfw}/qfw.c (100%) rename drivers/{misc => qfw}/qfw_acpi.c (100%) rename drivers/{misc => qfw}/qfw_mmio.c (100%) rename drivers/{misc => qfw}/qfw_pio.c (100%) rename drivers/{misc => qfw}/qfw_sandbox.c (100%) rename drivers/{misc => qfw}/qfw_smbios.c (100%) -- 2.43.0 base-commit: 537e97237e5caff985c9de5b1651c0dcb19c4c9a branch: qemg