diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-26 14:31:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-07 14:48:19 -0500 |
| commit | bfaa048d94cf8abf01ba54fe79b1b08bda6328f9 (patch) | |
| tree | d785b15c720b4aff91916a635b425ff2fefc60cd | |
| parent | 54ecce2cbf9061b7ac8d348dde67200c765a2a15 (diff) | |
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>
| -rw-r--r-- | board/emulation/qemu-arm/Kconfig | 3 | ||||
| -rw-r--r-- | board/emulation/qemu-x86/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/Kconfig | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig index 09c95413a54..ac2d078f42a 100644 --- 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 787751abba4..01dc1d497ae 100644 --- 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 df6d71c103f..7ff77a75747 100644 --- 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 |