Message ID | alpine.DEB.1.10.1411031811300.2881@tp.orcam.me.uk |
---|---|
State | New |
Headers | show |
On 03/11/2014 18:36, Maciej W. Rozycki wrote: > Fix the regression introduced with commit > 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa [hw: move ISA bridges and > devices to hw/isa/, configure with default-configs/], by removing > CONFIG_VT82C686 from configurations that previously did not enable it. > That southbridge is only available on Fulong platforms (CONFIG_FULONG) > that are exclusively little-endian, 64-bit MIPS. Previously vt82c686.o > was pulled explicitly with obj-$(CONFIG_FULONG). > > Signed-off-by: Maciej W. Rozycki <macro@codesourcery.com> > --- > Hi, > > Trivial stuff first, tougher later on. Compile-tested only, this > addresses a regression and should be obviously correct. Please apply. > > Thanks, > > Maciej > > qemu-mipseb-fulong-vt82c686.diff > Index: qemu-git-trunk/default-configs/mips-softmmu.mak > =================================================================== > --- qemu-git-trunk.orig/default-configs/mips-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 > +++ qemu-git-trunk/default-configs/mips-softmmu.mak 2014-10-28 23:01:51.178971390 +0000 > @@ -32,6 +32,5 @@ CONFIG_G364FB=y > CONFIG_I8259=y > CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > -CONFIG_VT82C686=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > Index: qemu-git-trunk/default-configs/mips64-softmmu.mak > =================================================================== > --- qemu-git-trunk.orig/default-configs/mips64-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 > +++ qemu-git-trunk/default-configs/mips64-softmmu.mak 2014-10-28 23:02:09.678926473 +0000 > @@ -32,6 +32,5 @@ CONFIG_G364FB=y > CONFIG_I8259=y > CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > -CONFIG_VT82C686=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > Index: qemu-git-trunk/default-configs/mipsel-softmmu.mak > =================================================================== > --- qemu-git-trunk.orig/default-configs/mipsel-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 > +++ qemu-git-trunk/default-configs/mipsel-softmmu.mak 2014-10-28 23:02:26.677701438 +0000 > @@ -32,6 +32,5 @@ CONFIG_G364FB=y > CONFIG_I8259=y > CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > -CONFIG_VT82C686=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Index: qemu-git-trunk/default-configs/mips-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mips-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mips-softmmu.mak 2014-10-28 23:01:51.178971390 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y Index: qemu-git-trunk/default-configs/mips64-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mips64-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mips64-softmmu.mak 2014-10-28 23:02:09.678926473 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y Index: qemu-git-trunk/default-configs/mipsel-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mipsel-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mipsel-softmmu.mak 2014-10-28 23:02:26.677701438 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y
Fix the regression introduced with commit 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa [hw: move ISA bridges and devices to hw/isa/, configure with default-configs/], by removing CONFIG_VT82C686 from configurations that previously did not enable it. That southbridge is only available on Fulong platforms (CONFIG_FULONG) that are exclusively little-endian, 64-bit MIPS. Previously vt82c686.o was pulled explicitly with obj-$(CONFIG_FULONG). Signed-off-by: Maciej W. Rozycki <macro@codesourcery.com> --- Hi, Trivial stuff first, tougher later on. Compile-tested only, this addresses a regression and should be obviously correct. Please apply. Thanks, Maciej qemu-mipseb-fulong-vt82c686.diff