| Message ID | 20191231183216.6781-11-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:12PM +0100, Philippe Mathieu-Daudé wrote: > The fw_cfg helpers are only used by machines using OpenBIOS. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Cc: "Hervé Poussineau" <hpoussin@reactos.org> > --- > hw/ppc/Kconfig | 6 ++++++ > hw/ppc/Makefile.objs | 3 ++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index d8482a5e99..e4ca920507 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -72,6 +72,7 @@ config PREP > select M48T59 > select PC87312 > select RS6000_MC > + select FW_CFG_PPC > > config RS6000_MC > bool > @@ -85,6 +86,7 @@ config MAC_OLDWORLD > select GRACKLE_PCI > select HEATHROW_PIC > select MACIO > + select FW_CFG_PPC > > config MAC_NEWWORLD > bool > @@ -96,6 +98,7 @@ config MAC_NEWWORLD > select MACIO_GPIO > select MAC_PMU > select UNIN_PCI > + select FW_CFG_PPC > > config E500 > bool > @@ -130,3 +133,6 @@ config XIVE_KVM > bool > default y > depends on XIVE_SPAPR && KVM > + > +config FW_CFG_PPC > + bool > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index 79adf06aa3..5c46c68e44 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 fw_cfg.o > +obj-y += ppc.o ppc_booke.o 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 > obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index d8482a5e99..e4ca920507 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -72,6 +72,7 @@ config PREP select M48T59 select PC87312 select RS6000_MC + select FW_CFG_PPC config RS6000_MC bool @@ -85,6 +86,7 @@ config MAC_OLDWORLD select GRACKLE_PCI select HEATHROW_PIC select MACIO + select FW_CFG_PPC config MAC_NEWWORLD bool @@ -96,6 +98,7 @@ config MAC_NEWWORLD select MACIO_GPIO select MAC_PMU select UNIN_PCI + select FW_CFG_PPC config E500 bool @@ -130,3 +133,6 @@ config XIVE_KVM bool default y depends on XIVE_SPAPR && KVM + +config FW_CFG_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 79adf06aa3..5c46c68e44 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 fw_cfg.o +obj-y += ppc.o ppc_booke.o 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 obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
The fw_cfg helpers are only used by machines using OpenBIOS. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Cc: "Hervé Poussineau" <hpoussin@reactos.org> --- hw/ppc/Kconfig | 6 ++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)