ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xtensa: 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 Xtensa.

No changes to generated config-devices.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-01-25 13:36:37 +01:00
parent 021cd4c6e2
commit 0a12e7b752
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/buildtest.yml
View File

@ -666,7 +666,7 @@ build-without-defaults:
--disable-strip --disable-strip
TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu mips-softmmu mips64-softmmu mipsel-softmmu sparc-softmmu
sparc64-softmmu tricore-softmmu sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu
hexagon-linux-user i386-linux-user s390x-linux-user hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check

9
configs/devices/xtensa-softmmu/default.mak
View File

@ -4,8 +4,7 @@
# #
#CONFIG_PCI_DEVICES=n #CONFIG_PCI_DEVICES=n
# Boards: # Boards are selected by default, uncomment to keep out of the build.
# # CONFIG_XTENSA_SIM=n
CONFIG_XTENSA_SIM=y # CONFIG_XTENSA_VIRT=n
CONFIG_XTENSA_VIRT=y # CONFIG_XTENSA_XTFPGA=n
CONFIG_XTENSA_XTFPGA=y

6
hw/xtensa/Kconfig
View File

@ -1,14 +1,20 @@
config XTENSA_SIM config XTENSA_SIM
default y
depends on XTENSA
bool bool
config XTENSA_VIRT config XTENSA_VIRT
bool bool
default y
depends on XTENSA
select XTENSA_SIM select XTENSA_SIM
select PCI_EXPRESS_GENERIC_BRIDGE select PCI_EXPRESS_GENERIC_BRIDGE
select PCI_DEVICES select PCI_DEVICES
config XTENSA_XTFPGA config XTENSA_XTFPGA
bool bool
default y
depends on XTENSA
select OPENCORES_ETH select OPENCORES_ETH
select PFLASH_CFI01 select PFLASH_CFI01
select SERIAL select SERIAL