On Sat, Jan 16, 2016 at 01:37:57PM +0100, Thomas Huth wrote: > On 15.01.2016 13:21, David Gibson wrote: > > At present, the core device model code for 8250-like serial ports > > (serial.c) and the code for serial ports attached to ISA-style legacy IO > > (serial-isa.c) are both controlled by the CONFIG_SERIAL variable. > > > > There are lots and lots of embedded platforms that have 8250-like serial > > ports but have never had anything resembling ISA legacy IO. Therefore, > > split serial-isa into its own CONFIG_SERIAL_ISA option so it can be > > disabled for platforms where it's not appropriate. > > > > For now, I enabled CONFIG_SERIAL_ISA in every default-config where > > CONFIG_SERIAL is enabled, excepting microblaze, moxie, or32, and > > xtensa. As best as I can tell, those platforms never used legacy ISA, > > and also don't include PCI support (which would allow connection of a > > PCI->ISA bridge and/or a southbridge including legacy ISA serial > > ports). > > > > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > > --- > > default-configs/alpha-softmmu.mak | 1 + > > default-configs/arm-softmmu.mak | 1 + > > default-configs/i386-softmmu.mak | 1 + > > default-configs/mips-softmmu.mak | 1 + > > default-configs/mips64-softmmu.mak | 1 + > > default-configs/mips64el-softmmu.mak | 1 + > > default-configs/mipsel-softmmu.mak | 1 + > > default-configs/ppc-softmmu.mak | 1 + > > default-configs/ppc64-softmmu.mak | 1 + > > default-configs/ppcemb-softmmu.mak | 1 + > > default-configs/sh4-softmmu.mak | 1 + > > default-configs/sh4eb-softmmu.mak | 1 + > > default-configs/sparc64-softmmu.mak | 1 + > > default-configs/x86_64-softmmu.mak | 1 + > > hw/char/Makefile.objs | 3 ++- > > 15 files changed, 16 insertions(+), 1 deletion(-) > ... > > diff --git a/default-configs/ppc-softmmu.mak > > b/default-configs/ppc-softmmu.mak > > index d4d0f9b..13eb94f 100644 > > --- a/default-configs/ppc-softmmu.mak > > +++ b/default-configs/ppc-softmmu.mak > > @@ -45,5 +45,6 @@ CONFIG_PLATFORM_BUS=y > > CONFIG_ETSEC=y > > CONFIG_LIBDECNUMBER=y > > # For PReP > > +CONFIG_SERIAL_ISA=y > > CONFIG_MC146818RTC=y > > CONFIG_ISA_TESTDEV=y > > diff --git a/default-configs/ppc64-softmmu.mak > > b/default-configs/ppc64-softmmu.mak > > index 70a89d1..3e243fd 100644 > > --- a/default-configs/ppc64-softmmu.mak > > +++ b/default-configs/ppc64-softmmu.mak > > @@ -50,6 +50,7 @@ CONFIG_LIBDECNUMBER=y > > CONFIG_XICS=$(CONFIG_PSERIES) > > CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM)) > > # For PReP > > +CONFIG_SERIAL_ISA=y > > CONFIG_MC146818RTC=y > > CONFIG_ISA_TESTDEV=y > > CONFIG_MEM_HOTPLUG=y > > A little bit off-topic ... but maybe we should simply "include > ppc-softmmu.mak" in ppc64-softmmu.mak since the ppc64-softmmu is > supposed to offer all the 32 bit platforms, too? Then changes like this > would only affect one file instead of two.
Um.. perhaps, but not really within the scope of this series.
>
> ...
> > diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
> > index 5931cc8..be42d2f 100644
> > --- a/hw/char/Makefile.objs
> > +++ b/hw/char/Makefile.objs
> > @@ -2,7 +2,8 @@ common-obj-$(CONFIG_IPACK) += ipoctal232.o
> > common-obj-$(CONFIG_ESCC) += escc.o
> > common-obj-$(CONFIG_PARALLEL) += parallel.o
> > common-obj-$(CONFIG_PL011) += pl011.o
> > -common-obj-$(CONFIG_SERIAL) += serial.o serial-isa.o
> > +common-obj-$(CONFIG_SERIAL) += serial.o
> > +common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o
> > common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o
> > common-obj-$(CONFIG_VIRTIO) += virtio-console.o
> > common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
>
> Patch looks fine to me.
>
> Reviewed-by: Thomas Huth <th...@redhat.com>
>
--
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
signature.asc
Description: PGP signature
