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 <pbonz...@redhat.com>
---
configs/devices/cris-softmmu/default.mak | 5 ++---
.gitlab-ci.d/buildtest.yml | 3 ++-
hw/cris/Kconfig | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/configs/devices/cris-softmmu/default.mak
b/configs/devices/cris-softmmu/default.mak
index 5932cf4d06f..ff73cd40847 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/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 3a03cdb0151..f4dc5666467 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/hw/cris/Kconfig b/hw/cris/Kconfig
index 884ad2cbc0d..26c7eef7437 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
--
2.44.0
