diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-25 13:36:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-03 15:47:47 +0200 |
| commit | 1a67aed81707f8bd97a4cf21b0c99af057be28bd (patch) | |
| tree | 19f8a846febde4f3efc11bb4a3e78f55cd78dc75 | |
| parent | 01ef1c0dc83cc40522b45f289cd5ed669b0f3da4 (diff) | |
| download | focaccia-qemu-1a67aed81707f8bd97a4cf21b0c99af057be28bd.tar.gz focaccia-qemu-1a67aed81707f8bd97a4cf21b0c99af057be28bd.zip | |
arm: switch boards to "default y"
For ARM targets, boards that require TCG are already using "default y". Switch ARM_VIRT to the same selection mechanism. No changes to generated config-devices.mak file. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 1 | ||||
| -rw-r--r-- | configs/devices/arm-softmmu/default.mak | 3 | ||||
| -rw-r--r-- | hw/arm/Kconfig | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index c6c9c242c5..3a03cdb015 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -648,6 +648,7 @@ build-tci: - make check-tcg # Check our reduced build configurations +# requires libfdt: aarch64, arm build-without-defaults: extends: .native_build_job_template needs: diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak index c1cfb3bcf7..31f77c2026 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -5,7 +5,8 @@ # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n -CONFIG_ARM_VIRT=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_ARM_VIRT=n # These are selected by default when TCG is enabled, uncomment them to # keep out of the build. diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index fe1f9643bd..98c264ed21 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,5 +1,7 @@ config ARM_VIRT bool + default y + depends on ARM imply PCI_DEVICES imply TEST_DEVICES imply VFIO_AMD_XGBE |