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 | 86280d86d67832f3d0aea80871374c05238ef3ce (patch) | |
| tree | 3440565f0d0bb22cc6a102f2643031717d5c8774 | |
| parent | e2ee238664a621c13cb22cf1375835507031a20a (diff) | |
| download | qemu-86280d86d67832f3d0aea80871374c05238ef3ce.zip qemu-86280d86d67832f3d0aea80871374c05238ef3ce.tar.gz qemu-86280d86d67832f3d0aea80871374c05238ef3ce.tar.bz2 | |
cris: 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 CRIS.
No changes to generated config-devices.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 3 | ||||
| -rw-r--r-- | configs/devices/cris-softmmu/default.mak | 5 | ||||
| -rw-r--r-- | hw/cris/Kconfig | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 3a03cdb..f4dc566 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -662,7 +662,8 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: alpha-softmmu avr-softmmu s390x-softmmu sh4-softmmu + TARGETS: alpha-softmmu avr-softmmu cris-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/cris-softmmu/default.mak b/configs/devices/cris-softmmu/default.mak index 5932cf4..ff73cd4 100644 --- a/configs/devices/cris-softmmu/default.mak +++ b/configs/devices/cris-softmmu/default.mak @@ -1,5 +1,4 @@ # Default configuration for cris-softmmu -# Boards: -# -CONFIG_AXIS=y +# Boards are selected by default, uncomment to keep out of the build. +# CONFIG_AXIS=n diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index 884ad2c..26c7eef 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -1,5 +1,7 @@ config AXIS bool + default y + depends on CRIS select ETRAXFS select PFLASH_CFI02 select NAND |