| Message ID | 1432729200-5322-2-git-send-email-hpoussin@reactos.org |
|---|---|
| State | New |
| Headers | show |
On 2015-05-27 14:19, Hervé Poussineau wrote: > Remove now useless device models from other MIPS configurations > > We're now compiling 18 files less than before. > > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > --- > 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(-) > > diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak > index cce2c81..f62a21a 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -21,14 +21,9 @@ CONFIG_PIIX4=y > CONFIG_IDE_ISA=y > CONFIG_IDE_PIIX=y > CONFIG_NE2000_ISA=y > -CONFIG_RC4030=y > -CONFIG_DP8393X=y > -CONFIG_DS1225Y=y > CONFIG_MIPSNET=y > CONFIG_PFLASH_CFI01=y > -CONFIG_G364FB=y > CONFIG_I8259=y > -CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > 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=y > CONFIG_IDE_ISA=y > CONFIG_IDE_PIIX=y > CONFIG_NE2000_ISA=y > -CONFIG_RC4030=y > -CONFIG_DP8393X=y > -CONFIG_DS1225Y=y > CONFIG_MIPSNET=y > CONFIG_PFLASH_CFI01=y > -CONFIG_G364FB=y > CONFIG_I8259=y > -CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y 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/mips64el-softmmu.mak > index 095de43..24ff6b9 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -28,6 +28,7 @@ CONFIG_DS1225Y=y > CONFIG_MIPSNET=y > CONFIG_PFLASH_CFI01=y > CONFIG_FULONG=y > +CONFIG_JAZZ=y > CONFIG_G364FB=y > CONFIG_I8259=y > CONFIG_JAZZ_LED=y > 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=y > CONFIG_IDE_ISA=y > CONFIG_IDE_PIIX=y > CONFIG_NE2000_ISA=y > -CONFIG_RC4030=y > -CONFIG_DP8393X=y > -CONFIG_DS1225Y=y > CONFIG_MIPSNET=y > CONFIG_PFLASH_CFI01=y > -CONFIG_G364FB=y > CONFIG_I8259=y > -CONFIG_JAZZ_LED=y > CONFIG_MC146818RTC=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > 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 += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o > +obj-y += mips_r4k.o mips_malta.o mips_mipssim.o > obj-y += addr.o cputimer.o mips_int.o > +obj-$(CONFIG_JAZZ) += mips_jazz.o > obj-$(CONFIG_FULONG) += mips_fulong2e.o > obj-y += 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, > > /* init CPUs */ > if (cpu_model == NULL) { > -#ifdef TARGET_MIPS64 > cpu_model = "R4000"; > -#else > - /* FIXME: All wrong, this maybe should be R3000 for the older JAZZs. */ > - cpu_model = "24Kf"; > -#endif > } > cpu = cpu_mips_init(cpu_model); > if (cpu == 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 { > > static const TestCase test_cases[] = { > { "i386", "pc", -1 }, > - { "mips", "magnum", 0x90000000, .bswap = true }, > - { "mips", "pica61", 0x90000000, .bswap = true }, > { "mips", "mips", 0x14000000, .bswap = true }, > { "mips", "malta", 0x10000000, .bswap = true }, > - { "mips64", "magnum", 0x90000000, .bswap = true }, > - { "mips64", "pica61", 0x90000000, .bswap = true }, > { "mips64", "mips", 0x14000000, .bswap = true }, > { "mips64", "malta", 0x10000000, .bswap = true }, > { "mips64el", "fulong2e", 0x1fd00000 }, > -- > 2.1.4 > >
Le 02/06/2015 13:02, Aurelien Jarno a écrit : > On 2015-05-27 14:19, Hervé Poussineau wrote: >> Remove now useless device models from other MIPS configurations >> >> We're now compiling 18 files less than before. >> >> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> >> --- >> 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(-) >> >> diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak >> index cce2c81..f62a21a 100644 >> --- a/default-configs/mips-softmmu.mak >> +++ b/default-configs/mips-softmmu.mak >> @@ -21,14 +21,9 @@ CONFIG_PIIX4=y >> CONFIG_IDE_ISA=y >> CONFIG_IDE_PIIX=y >> CONFIG_NE2000_ISA=y >> -CONFIG_RC4030=y >> -CONFIG_DP8393X=y >> -CONFIG_DS1225Y=y >> CONFIG_MIPSNET=y >> CONFIG_PFLASH_CFI01=y >> -CONFIG_G364FB=y >> CONFIG_I8259=y >> -CONFIG_JAZZ_LED=y >> CONFIG_MC146818RTC=y >> CONFIG_ISA_TESTDEV=y >> CONFIG_EMPTY_SLOT=y >> 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=y >> CONFIG_IDE_ISA=y >> CONFIG_IDE_PIIX=y >> CONFIG_NE2000_ISA=y >> -CONFIG_RC4030=y >> -CONFIG_DP8393X=y >> -CONFIG_DS1225Y=y >> CONFIG_MIPSNET=y >> CONFIG_PFLASH_CFI01=y >> -CONFIG_G364FB=y >> CONFIG_I8259=y >> -CONFIG_JAZZ_LED=y >> CONFIG_MC146818RTC=y >> CONFIG_ISA_TESTDEV=y >> CONFIG_EMPTY_SLOT=y > > 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. > Yes, MIPS Magnum are dual endian. However, they always start in little-endian mode, and firmware switches CPU to big-endian if required. If you prefer that I keep the 64 bit big-endian variant, I can do it. Regards, Hervé
On 2015-06-02 20:04, Hervé Poussineau wrote: > Le 02/06/2015 13:02, Aurelien Jarno a écrit : > >On 2015-05-27 14:19, Hervé Poussineau wrote: > >>Remove now useless device models from other MIPS configurations > >> > >>We're now compiling 18 files less than before. > >> > >>Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > >>--- > >> 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(-) > >> > >>diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak > >>index cce2c81..f62a21a 100644 > >>--- a/default-configs/mips-softmmu.mak > >>+++ b/default-configs/mips-softmmu.mak > >>@@ -21,14 +21,9 @@ CONFIG_PIIX4=y > >> CONFIG_IDE_ISA=y > >> CONFIG_IDE_PIIX=y > >> CONFIG_NE2000_ISA=y > >>-CONFIG_RC4030=y > >>-CONFIG_DP8393X=y > >>-CONFIG_DS1225Y=y > >> CONFIG_MIPSNET=y > >> CONFIG_PFLASH_CFI01=y > >>-CONFIG_G364FB=y > >> CONFIG_I8259=y > >>-CONFIG_JAZZ_LED=y > >> CONFIG_MC146818RTC=y > >> CONFIG_ISA_TESTDEV=y > >> CONFIG_EMPTY_SLOT=y > >>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=y > >> CONFIG_IDE_ISA=y > >> CONFIG_IDE_PIIX=y > >> CONFIG_NE2000_ISA=y > >>-CONFIG_RC4030=y > >>-CONFIG_DP8393X=y > >>-CONFIG_DS1225Y=y > >> CONFIG_MIPSNET=y > >> CONFIG_PFLASH_CFI01=y > >>-CONFIG_G364FB=y > >> CONFIG_I8259=y > >>-CONFIG_JAZZ_LED=y > >> CONFIG_MC146818RTC=y > >> CONFIG_ISA_TESTDEV=y > >> CONFIG_EMPTY_SLOT=y > > > >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. > > > > Yes, MIPS Magnum are dual endian. However, they always start in little-endian mode, and firmware switches CPU to big-endian if required. > If you prefer that I keep the 64 bit big-endian variant, I can do it. I guess QEMU doesn't support the endian switch, so we have to keep the two versions so that people can use either a little or a big endian guest.
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index cce2c81..f62a21a 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -21,14 +21,9 @@ CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y -CONFIG_G364FB=y CONFIG_I8259=y -CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y 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=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y -CONFIG_G364FB=y CONFIG_I8259=y -CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 095de43..24ff6b9 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -28,6 +28,7 @@ CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_FULONG=y +CONFIG_JAZZ=y CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y 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=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y -CONFIG_G364FB=y CONFIG_I8259=y -CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y 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 += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o +obj-y += mips_r4k.o mips_malta.o mips_mipssim.o obj-y += addr.o cputimer.o mips_int.o +obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-y += 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, /* init CPUs */ if (cpu_model == NULL) { -#ifdef TARGET_MIPS64 cpu_model = "R4000"; -#else - /* FIXME: All wrong, this maybe should be R3000 for the older JAZZs. */ - cpu_model = "24Kf"; -#endif } cpu = cpu_mips_init(cpu_model); if (cpu == 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 { static const TestCase test_cases[] = { { "i386", "pc", -1 }, - { "mips", "magnum", 0x90000000, .bswap = true }, - { "mips", "pica61", 0x90000000, .bswap = true }, { "mips", "mips", 0x14000000, .bswap = true }, { "mips", "malta", 0x10000000, .bswap = true }, - { "mips64", "magnum", 0x90000000, .bswap = true }, - { "mips64", "pica61", 0x90000000, .bswap = true }, { "mips64", "mips", 0x14000000, .bswap = true }, { "mips64", "malta", 0x10000000, .bswap = true }, { "mips64el", "fulong2e", 0x1fd00000 },
Remove now useless device models from other MIPS configurations We're now compiling 18 files less than before. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- 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(-)