On Tue, Feb 24, 2015 at 12:55 AM, David Gibson <da...@gibson.dropbear.id.au> wrote: > On Mon, Feb 23, 2015 at 10:17:58PM -0800, Peter Crosthwaite wrote: >> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson >> <da...@gibson.dropbear.id.au> wrote: >> > The i82801b11, ioh3420 and xio3130 PCI Express devices are currently >> > included in the build unconditionally. >> > >> > While they could theoretically appear on any target platform with PCI-E, >> > they're pretty unlikely to appear on platforms that aren't Intel derived. >> > >> > Therefore, to avoid presenting unlikely-to-be-relevant devices to the user, >> > add config options to enable these componenets, and enable they by default >> >> "components", "them" > > Oops, those are embarrassing. > >> > only on x86 and arm platforms. >> > >> > (Note that this patch does include these for aarch64, via its inclusion of >> > arm-softmmu.mak). >> > >> >> "it's" > > No, "its" is correct. It's a possessive, not a contraction. >
OK, my bad. Regards, Peter >> > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> >> >> Otherwise, >> >> Reviewed-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> >> >> > --- >> > default-configs/arm-softmmu.mak | 4 ++++ >> > default-configs/i386-softmmu.mak | 3 +++ >> > default-configs/x86_64-softmmu.mak | 3 +++ >> > hw/pci-bridge/Makefile.objs | 5 +++-- >> > 4 files changed, 13 insertions(+), 2 deletions(-) >> > >> > diff --git a/default-configs/arm-softmmu.mak >> > b/default-configs/arm-softmmu.mak >> > index b00c2e1..6ee9b43 100644 >> > --- a/default-configs/arm-softmmu.mak >> > +++ b/default-configs/arm-softmmu.mak >> > @@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y >> > CONFIG_ALLWINNER_A10_PIT=y >> > CONFIG_ALLWINNER_A10_PIC=y >> > CONFIG_ALLWINNER_A10=y >> > + >> > +CONFIG_XIO3130=y >> > +CONFIG_IOH3420=y >> > +CONFIG_I82801B11=y >> > diff --git a/default-configs/i386-softmmu.mak >> > b/default-configs/i386-softmmu.mak >> > index bd99af9..0b8ce4b 100644 >> > --- a/default-configs/i386-softmmu.mak >> > +++ b/default-configs/i386-softmmu.mak >> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y >> > CONFIG_ICC_BUS=y >> > CONFIG_PVPANIC=y >> > CONFIG_MEM_HOTPLUG=y >> > +CONFIG_XIO3130=y >> > +CONFIG_IOH3420=y >> > +CONFIG_I82801B11=y >> > diff --git a/default-configs/x86_64-softmmu.mak >> > b/default-configs/x86_64-softmmu.mak >> > index e7c2734..6add04a 100644 >> > --- a/default-configs/x86_64-softmmu.mak >> > +++ b/default-configs/x86_64-softmmu.mak >> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y >> > CONFIG_ICC_BUS=y >> > CONFIG_PVPANIC=y >> > CONFIG_MEM_HOTPLUG=y >> > +CONFIG_XIO3130=y >> > +CONFIG_IOH3420=y >> > +CONFIG_I82801B11=y >> > diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs >> > index 968b369..96c596e 100644 >> > --- a/hw/pci-bridge/Makefile.objs >> > +++ b/hw/pci-bridge/Makefile.objs >> > @@ -1,5 +1,6 @@ >> > common-obj-y += pci_bridge_dev.o >> > -common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o >> > -common-obj-y += i82801b11.o >> > +common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o >> > +common-obj-$(CONFIG_IOH3420) += ioh3420.o >> > +common-obj-$(CONFIG_I82801B11) += i82801b11.o >> > # NewWorld PowerMac >> > common-obj-$(CONFIG_DEC_PCI) += dec.o >> > >> > >> > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson
