summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2024-01-25 13:36:37 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2024-05-03 15:47:47 +0200
commit9e6190aecd37510dc111f7a41fed8f08ff14630c (patch)
tree256d334c2aa8ae0c9791d60f25bc87f5dec8c5a5
parent86280d86d67832f3d0aea80871374c05238ef3ce (diff)
downloadfocaccia-qemu-9e6190aecd37510dc111f7a41fed8f08ff14630c.tar.gz
focaccia-qemu-9e6190aecd37510dc111f7a41fed8f08ff14630c.zip
hppa: switch boards to "default y"
Some targets use "default y" for boards to filter out those that require
TCG.  For consistency we are switching all other targets to do the same.
Continue with PARISC.

No changes to generated config-devices.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--.gitlab-ci.d/buildtest.yml2
-rw-r--r--configs/devices/hppa-softmmu/default.mak5
-rw-r--r--hw/hppa/Kconfig2
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index f4dc566646..6531758d96 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -662,7 +662,7 @@ build-without-defaults:
       --disable-pie
       --disable-qom-cast-debug
       --disable-strip
-    TARGETS: alpha-softmmu avr-softmmu cris-softmmu
+    TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu
       s390x-softmmu sh4-softmmu
       sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
     MAKE_CHECK_ARGS: check
diff --git a/configs/devices/hppa-softmmu/default.mak b/configs/devices/hppa-softmmu/default.mak
index b0364bb88f..059510cdbb 100644
--- a/configs/devices/hppa-softmmu/default.mak
+++ b/configs/devices/hppa-softmmu/default.mak
@@ -4,6 +4,5 @@
 #
 #CONFIG_PCI_DEVICES=n
 
-# Boards:
-#
-CONFIG_HPPA_B160L=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_HPPA_B160L=n
diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
index ee7ffd2bfb..d4d457f4ab 100644
--- a/hw/hppa/Kconfig
+++ b/hw/hppa/Kconfig
@@ -1,5 +1,7 @@
 config HPPA_B160L
     bool
+    default y
+    depends on HPPA
     imply PCI_DEVICES
     imply E1000_PCI
     imply USB_OHCI_PCI