| Message ID | 20191231183216.6781-12-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw: Fix various --without-default-devices issues | expand |
On Tue, Dec 31, 2019 at 07:32:13PM +0100, Philippe Mathieu-Daudé wrote: > Not all machines use the ppc_create_page_sizes_prop() helper. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > Can Kconfig can restrict to TARGET_PPC64? > --- > hw/ppc/Kconfig | 10 ++++++++++ > hw/ppc/Makefile.objs | 3 ++- > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index e4ca920507..8e62d8f470 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -10,6 +10,7 @@ config PSERIES > select XICS_SPAPR > select XIVE_SPAPR > select MSI_NONBROKEN > + select FDT_PPC > > config SPAPR_RNG > bool > @@ -26,6 +27,7 @@ config POWERNV > select MC146818RTC > select XICS > select XIVE > + select FDT_PPC > > config PPC405 > bool > @@ -42,6 +44,7 @@ config PPC440 > select PCI_EXPRESS > select PPC4XX > select SERIAL > + select FDT_PPC > > config PPC4XX > bool > @@ -60,6 +63,7 @@ config SAM460EX > select SMBUS_EEPROM > select USB_EHCI_SYSBUS > select USB_OHCI > + select FDT_PPC > > config PREP > bool > @@ -110,6 +114,7 @@ config E500 > select PPCE500_PCI > select SERIAL > select MPC_I2C > + select FDT_PPC > > config VIRTEX > bool > @@ -118,6 +123,7 @@ config VIRTEX > select SERIAL > select XILINX > select XILINX_ETHLITE > + select FDT_PPC > > config XIVE > bool > @@ -134,5 +140,9 @@ config XIVE_KVM > default y > depends on XIVE_SPAPR && KVM > > +# Only used by 64-bit targets > config FW_CFG_PPC > bool > + > +config FDT_PPC > + bool > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index 5c46c68e44..a4bac57be6 100644 > --- a/hw/ppc/Makefile.objs > +++ b/hw/ppc/Makefile.objs > @@ -1,5 +1,6 @@ > # shared objects > -obj-y += ppc.o ppc_booke.o fdt.o > +obj-y += ppc.o ppc_booke.o > +obj-$(CONFIG_FDT_PPC) += fdt.o > obj-$(CONFIG_FW_CFG_PPC) += fw_cfg.o > # IBM pSeries (sPAPR) > obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index e4ca920507..8e62d8f470 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -10,6 +10,7 @@ config PSERIES select XICS_SPAPR select XIVE_SPAPR select MSI_NONBROKEN + select FDT_PPC config SPAPR_RNG bool @@ -26,6 +27,7 @@ config POWERNV select MC146818RTC select XICS select XIVE + select FDT_PPC config PPC405 bool @@ -42,6 +44,7 @@ config PPC440 select PCI_EXPRESS select PPC4XX select SERIAL + select FDT_PPC config PPC4XX bool @@ -60,6 +63,7 @@ config SAM460EX select SMBUS_EEPROM select USB_EHCI_SYSBUS select USB_OHCI + select FDT_PPC config PREP bool @@ -110,6 +114,7 @@ config E500 select PPCE500_PCI select SERIAL select MPC_I2C + select FDT_PPC config VIRTEX bool @@ -118,6 +123,7 @@ config VIRTEX select SERIAL select XILINX select XILINX_ETHLITE + select FDT_PPC config XIVE bool @@ -134,5 +140,9 @@ config XIVE_KVM default y depends on XIVE_SPAPR && KVM +# Only used by 64-bit targets config FW_CFG_PPC bool + +config FDT_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 5c46c68e44..a4bac57be6 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,6 @@ # shared objects -obj-y += ppc.o ppc_booke.o fdt.o +obj-y += ppc.o ppc_booke.o +obj-$(CONFIG_FDT_PPC) += fdt.o obj-$(CONFIG_FW_CFG_PPC) += fw_cfg.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o
Not all machines use the ppc_create_page_sizes_prop() helper. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- Can Kconfig can restrict to TARGET_PPC64? --- hw/ppc/Kconfig | 10 ++++++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-)