From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3LO3-0005F6-EZ for qemu-devel@nongnu.org; Fri, 12 Jun 2015 05:36:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3LNw-0006bM-Ca for qemu-devel@nongnu.org; Fri, 12 Jun 2015 05:36:31 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:22092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3LNw-0006al-3v for qemu-devel@nongnu.org; Fri, 12 Jun 2015 05:36:24 -0400 From: Leon Alrae Date: Fri, 12 Jun 2015 10:35:15 +0100 Message-ID: <1434101736-11558-9-git-send-email-leon.alrae@imgtec.com> In-Reply-To: <1434101736-11558-1-git-send-email-leon.alrae@imgtec.com> References: <1434101736-11558-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/29] mips jazz: compile only in 64 bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Herv=C3=A9 Poussineau Remove now useless device models from other MIPS configurations We're now compiling 12 files less than before. Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Aurelien Jarno Signed-off-by: Leon Alrae --- default-configs/mips-softmmu.mak | 5 ----- default-configs/mips64-softmmu.mak | 1 + 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 | 2 -- 7 files changed, 4 insertions(+), 18 deletions(-) diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-soft= mmu.mak index fd0607d..44467c3 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -24,14 +24,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 b8c7910..66ed5f9 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -29,6 +29,7 @@ CONFIG_DP8393X=3Dy CONFIG_DS1225Y=3Dy CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy +CONFIG_JAZZ=3Dy CONFIG_G364FB=3Dy CONFIG_I8259=3Dy CONFIG_JAZZ_LED=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips6= 4el-softmmu.mak index ae4274b..bfca2b2 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -31,6 +31,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 1e2374b..0162ef0 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -24,14 +24,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..26ee734 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -31,8 +31,6 @@ 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 }, --=20 2.1.0