ppc: 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 PowerPC/POWER.

No changes to generated config-devices.mak files, other than
adding CONFIG_PPC to the ppc64-softmmu target.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-01-25 13:36:37 +01:00
parent c8b39c9b5b
commit bf616ce47b
5 changed files with 45 additions and 18 deletions

View file

@ -649,7 +649,7 @@ build-tci:
# Check our reduced build configurations # Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# mips64el, or1k, x86_64 # mips64el, or1k, ppc, ppc64, x86_64
# does not build without boards: i386, loongarch64, x86_64 # does not build without boards: i386, loongarch64, x86_64
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template

View file

@ -4,22 +4,24 @@
# CONFIG_PCI_DEVICES=n # CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
# For embedded PPCs: # Boards are selected by default, uncomment to keep out of the build.
CONFIG_E500PLAT=y
CONFIG_MPC8544DS=y # Embedded PPCs:
CONFIG_PPC405=y # CONFIG_E500PLAT=n
CONFIG_PPC440=y # CONFIG_MPC8544DS=n
CONFIG_VIRTEX=y # CONFIG_PPC405=n
# CONFIG_PPC440=n
# CONFIG_VIRTEX=n
# For Sam460ex # For Sam460ex
CONFIG_SAM460EX=y # CONFIG_SAM460EX=n
# For Macs # For Macs
CONFIG_MAC_OLDWORLD=y # CONFIG_MAC_OLDWORLD=n
CONFIG_MAC_NEWWORLD=y # CONFIG_MAC_NEWWORLD=n
CONFIG_AMIGAONE=y # CONFIG_AMIGAONE=n
CONFIG_PEGASOS2=y # CONFIG_PEGASOS2=n
# For PReP # For PReP
CONFIG_PREP=y # CONFIG_PREP=n

View file

@ -3,8 +3,6 @@
# Include all 32-bit boards # Include all 32-bit boards
include ../ppc-softmmu/default.mak include ../ppc-softmmu/default.mak
# For PowerNV # Boards are selected by default, uncomment to keep out of the build.
CONFIG_POWERNV=y # CONFIG_POWERNV=n
# CONFIG_PSERIES=n
# For pSeries
CONFIG_PSERIES=y

View file

@ -1,5 +1,7 @@
config PSERIES config PSERIES
bool bool
default y
depends on PPC64
imply USB_OHCI_PCI imply USB_OHCI_PCI
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
@ -23,6 +25,8 @@ config SPAPR_RNG
config POWERNV config POWERNV
bool bool
default y
depends on PPC64
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
select ISA_IPMI_BT select ISA_IPMI_BT
@ -38,6 +42,8 @@ config POWERNV
config PPC405 config PPC405
bool bool
default y
depends on PPC
select M48T59 select M48T59
select PFLASH_CFI02 select PFLASH_CFI02
select PPC4XX select PPC4XX
@ -45,6 +51,8 @@ config PPC405
config PPC440 config PPC440
bool bool
default y
depends on PPC
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
imply E1000_PCI imply E1000_PCI
@ -62,6 +70,8 @@ config PPC4XX
config SAM460EX config SAM460EX
bool bool
default y
depends on PPC
select PFLASH_CFI01 select PFLASH_CFI01
select IDE_SII3112 select IDE_SII3112
select M41T80 select M41T80
@ -75,6 +85,8 @@ config SAM460EX
config AMIGAONE config AMIGAONE
bool bool
default y
depends on PPC
imply ATI_VGA imply ATI_VGA
select ARTICIA select ARTICIA
select VT82C686 select VT82C686
@ -82,6 +94,8 @@ config AMIGAONE
config PEGASOS2 config PEGASOS2
bool bool
default y
depends on PPC
imply ATI_VGA imply ATI_VGA
select MV64361 select MV64361
select VT82C686 select VT82C686
@ -90,6 +104,8 @@ config PEGASOS2
config PREP config PREP
bool bool
default y
depends on PPC
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
select CS4231A select CS4231A
@ -106,6 +122,8 @@ config RS6000_MC
config MAC_OLDWORLD config MAC_OLDWORLD
bool bool
default y
depends on PPC
imply PCI_DEVICES imply PCI_DEVICES
imply SUNGEM imply SUNGEM
imply TEST_DEVICES imply TEST_DEVICES
@ -117,6 +135,8 @@ config MAC_OLDWORLD
config MAC_NEWWORLD config MAC_NEWWORLD
bool bool
default y
depends on PPC
imply PCI_DEVICES imply PCI_DEVICES
imply SUNGEM imply SUNGEM
imply TEST_DEVICES imply TEST_DEVICES
@ -147,14 +167,20 @@ config E500
config E500PLAT config E500PLAT
bool bool
default y
depends on PPC
select E500 select E500
config MPC8544DS config MPC8544DS
bool bool
default y
depends on PPC
select E500 select E500
config VIRTEX config VIRTEX
bool bool
default y
depends on PPC
select PPC4XX select PPC4XX
select PFLASH_CFI01 select PFLASH_CFI01
select SERIAL select SERIAL

View file

@ -3,3 +3,4 @@ config PPC
config PPC64 config PPC64
bool bool
select PPC