Browse Source

sparc: 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 SPARC and SPARC64.

No changes to generated config-devices.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/266/head
Paolo Bonzini 3 years ago
parent
commit
d399fddcd4
  1. 5
      .gitlab-ci.d/buildtest.yml
  2. 7
      configs/devices/sparc-softmmu/default.mak
  3. 7
      configs/devices/sparc64-softmmu/default.mak
  4. 4
      hw/sparc/Kconfig
  5. 4
      hw/sparc64/Kconfig

5
.gitlab-ci.d/buildtest.yml

@ -665,8 +665,9 @@ build-without-defaults:
--disable-qom-cast-debug
--disable-strip
TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
mips-softmmu mips64-softmmu mipsel-softmmu
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu
sparc64-softmmu
hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check
build-libvhost-user:

7
configs/devices/sparc-softmmu/default.mak

@ -5,7 +5,6 @@
#CONFIG_TCX=n
#CONFIG_CG3=n
# Boards:
#
CONFIG_SUN4M=y
CONFIG_LEON3=y
# Boards are selected by default, uncomment to keep out of the build.
# CONFIG_SUN4M=n
# CONFIG_LEON3=n

7
configs/devices/sparc64-softmmu/default.mak

@ -6,7 +6,6 @@
#CONFIG_SUNHME=n
#CONFIG_TEST_DEVICES=n
# Boards:
#
CONFIG_SUN4U=y
CONFIG_NIAGARA=y
# Boards are selected by default, uncomment to keep out of the build.
# CONFIG_SUN4U=n
# CONFIG_NIAGARA=n

4
hw/sparc/Kconfig

@ -1,5 +1,7 @@
config SUN4M
bool
default y
depends on SPARC && !SPARC64
imply TCX
imply CG3
select CS4231
@ -18,6 +20,8 @@ config SUN4M
config LEON3
bool
default y
depends on SPARC && !SPARC64
select GRLIB
config GRLIB

4
hw/sparc64/Kconfig

@ -1,5 +1,7 @@
config SUN4U
bool
default y
depends on SPARC64
imply PCI_DEVICES
imply SUNHME
imply TEST_DEVICES
@ -16,6 +18,8 @@ config SUN4U
config NIAGARA
bool
default y
depends on SPARC64
select EMPTY_SLOT
select SUN4V_RTC
select UNIMP

Loading…
Cancel
Save