qemu: Correct CMD_QFW dependencies in Kconfig

Rather than selecting CMD_QFW, we should make the option itself by
enabled by default on these platforms.  Then in the board-specific
Kconfig we should select the appropriate back-end as needed if the
command is enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig
index 09c95413a54140b139a235e16eabf023aba13398..ac2d078f42a144206881dac06aaa6b3cd8c2b926 100644 (file)
--- a/board/emulation/qemu-arm/Kconfig
+++ b/board/emulation/qemu-arm/Kconfig
@@ -5,8 +5,7 @@ config TEXT_BASE
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select CMD_QFW
-       select QFW_MMIO
+       select QFW_MMIO if CMD_QFW
        imply VIRTIO_MMIO
        imply VIRTIO_PCI
        imply VIRTIO_NET

diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index 787751abba4fc185a88a6c80521e04737ff58279..01dc1d497aec8375cbf481c768db68fe25a5482e 100644 (file)
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR
        select QEMU
-       select QFW_PIO
+       select QFW_PIO if CMD_QFW
        select BOARD_ROMSIZE_KB_1024
        imply VIRTIO_PCI
        imply VIRTIO_NET

diff --git a/cmd/Kconfig b/cmd/Kconfig
index df6d71c103f907ad4b0b1dd9d245a02087006b2d..7ff77a7574763b43a16e94c6be5d1ecde530c727 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -2257,6 +2257,8 @@ config CMD_SYSBOOT
 config CMD_QFW
        bool "qfw"
        select QFW
+       default y if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \
+               TARGET_QEMU_X86 || TARGET_QEMU_X86_64
        help
          This provides access to the QEMU firmware interface.  The main
          feature is to allow easy loading of files passed to qemu-system