From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzjxk-0004W7-9K for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzjxj-0004PE-19 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:02:28 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:59778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzjxi-0004P7-NC for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:02:26 -0400 Date: Tue, 2 Jun 2015 13:02:24 +0200 From: Aurelien Jarno Message-ID: <20150602110224.GA26298@aurel32.net> References: <1432729200-5322-1-git-send-email-hpoussin@reactos.org> <1432729200-5322-2-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <1432729200-5322-2-git-send-email-hpoussin@reactos.org> Sender: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH v2 01/17] mips jazz: compile only in 64 bit little endian List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-15?Q?Herv=E9?= Poussineau Cc: Leon Alrae , qemu-devel@nongnu.org On 2015-05-27 14:19, Herv=E9 Poussineau wrote: > Remove now useless device models from other MIPS configurations >=20 > We're now compiling 18 files less than before. >=20 > Signed-off-by: Herv=E9 Poussineau > --- > default-configs/mips-softmmu.mak | 5 ----- > default-configs/mips64-softmmu.mak | 5 ----- > default-configs/mips64el-softmmu.mak | 1 + > default-configs/mipsel-softmmu.mak | 5 ----- > hw/mips/Makefile.objs | 3 ++- > hw/mips/mips_jazz.c | 5 ----- > tests/endianness-test.c | 4 ---- > 7 files changed, 3 insertions(+), 25 deletions(-) >=20 > diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-soft= mmu.mak > index cce2c81..f62a21a 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -21,14 +21,9 @@ CONFIG_PIIX4=3Dy > CONFIG_IDE_ISA=3Dy > CONFIG_IDE_PIIX=3Dy > CONFIG_NE2000_ISA=3Dy > -CONFIG_RC4030=3Dy > -CONFIG_DP8393X=3Dy > -CONFIG_DS1225Y=3Dy > CONFIG_MIPSNET=3Dy > CONFIG_PFLASH_CFI01=3Dy > -CONFIG_G364FB=3Dy > CONFIG_I8259=3Dy > -CONFIG_JAZZ_LED=3Dy > CONFIG_MC146818RTC=3Dy > CONFIG_ISA_TESTDEV=3Dy > CONFIG_EMPTY_SLOT=3Dy > diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-= softmmu.mak > index 7a88a08..accedca 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -21,14 +21,9 @@ CONFIG_PIIX4=3Dy > CONFIG_IDE_ISA=3Dy > CONFIG_IDE_PIIX=3Dy > CONFIG_NE2000_ISA=3Dy > -CONFIG_RC4030=3Dy > -CONFIG_DP8393X=3Dy > -CONFIG_DS1225Y=3Dy > CONFIG_MIPSNET=3Dy > CONFIG_PFLASH_CFI01=3Dy > -CONFIG_G364FB=3Dy > CONFIG_I8259=3Dy > -CONFIG_JAZZ_LED=3Dy > CONFIG_MC146818RTC=3Dy > CONFIG_ISA_TESTDEV=3Dy > CONFIG_EMPTY_SLOT=3Dy TTBOMK, MIPS Magnum machines are dual endian, so why remove the 64-bit big endian version? On the other hand, I am all for removing the 32-bit versions. > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips6= 4el-softmmu.mak > index 095de43..24ff6b9 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -28,6 +28,7 @@ CONFIG_DS1225Y=3Dy > CONFIG_MIPSNET=3Dy > CONFIG_PFLASH_CFI01=3Dy > CONFIG_FULONG=3Dy > +CONFIG_JAZZ=3Dy > CONFIG_G364FB=3Dy > CONFIG_I8259=3Dy > CONFIG_JAZZ_LED=3Dy > diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-= softmmu.mak > index 0e25108..9fbee82 100644 > --- a/default-configs/mipsel-softmmu.mak > +++ b/default-configs/mipsel-softmmu.mak > @@ -21,14 +21,9 @@ CONFIG_PIIX4=3Dy > CONFIG_IDE_ISA=3Dy > CONFIG_IDE_PIIX=3Dy > CONFIG_NE2000_ISA=3Dy > -CONFIG_RC4030=3Dy > -CONFIG_DP8393X=3Dy > -CONFIG_DS1225Y=3Dy > CONFIG_MIPSNET=3Dy > CONFIG_PFLASH_CFI01=3Dy > -CONFIG_G364FB=3Dy > CONFIG_I8259=3Dy > -CONFIG_JAZZ_LED=3Dy > CONFIG_MC146818RTC=3Dy > CONFIG_ISA_TESTDEV=3Dy > CONFIG_EMPTY_SLOT=3Dy > diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs > index 0a652f8..9633f3a 100644 > --- a/hw/mips/Makefile.objs > +++ b/hw/mips/Makefile.objs > @@ -1,4 +1,5 @@ > -obj-y +=3D mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o > +obj-y +=3D mips_r4k.o mips_malta.o mips_mipssim.o > obj-y +=3D addr.o cputimer.o mips_int.o > +obj-$(CONFIG_JAZZ) +=3D mips_jazz.o > obj-$(CONFIG_FULONG) +=3D mips_fulong2e.o > obj-y +=3D gt64xxx_pci.o > diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c > index 2c153e0..f16070e 100644 > --- a/hw/mips/mips_jazz.c > +++ b/hw/mips/mips_jazz.c > @@ -157,12 +157,7 @@ static void mips_jazz_init(MachineState *machine, > =20 > /* init CPUs */ > if (cpu_model =3D=3D NULL) { > -#ifdef TARGET_MIPS64 > cpu_model =3D "R4000"; > -#else > - /* FIXME: All wrong, this maybe should be R3000 for the older JA= ZZs. */ > - cpu_model =3D "24Kf"; > -#endif > } > cpu =3D cpu_mips_init(cpu_model); > if (cpu =3D=3D NULL) { > diff --git a/tests/endianness-test.c b/tests/endianness-test.c > index 92e17d2..9506da0 100644 > --- a/tests/endianness-test.c > +++ b/tests/endianness-test.c > @@ -31,12 +31,8 @@ struct TestCase { > =20 > static const TestCase test_cases[] =3D { > { "i386", "pc", -1 }, > - { "mips", "magnum", 0x90000000, .bswap =3D true }, > - { "mips", "pica61", 0x90000000, .bswap =3D true }, > { "mips", "mips", 0x14000000, .bswap =3D true }, > { "mips", "malta", 0x10000000, .bswap =3D true }, > - { "mips64", "magnum", 0x90000000, .bswap =3D true }, > - { "mips64", "pica61", 0x90000000, .bswap =3D true }, > { "mips64", "mips", 0x14000000, .bswap =3D true }, > { "mips64", "malta", 0x10000000, .bswap =3D true }, > { "mips64el", "fulong2e", 0x1fd00000 }, > --=20 > 2.1.4 >=20 >=20 --=20 Aurelien Jarno GPG: 4096R/1DDD8C9B aurelien@aurel32.net http://www.aurel32.net