mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mips jazz: compile only in 64 bit

Browse Source 
Remove now useless device models from other MIPS configurations

We're now compiling 12 files less than before.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
This commit is contained in:
Hervé Poussineau 2015-06-03 22:45:35 +02:00 committed by Leon Alrae
parent ce9782f40a
commit 9b1d21c53b
7 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default-configs/mips-softmmu.mak
View File

@ -24,14 +24,9 @@ CONFIG_PIIX4=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_RC4030=y
CONFIG_DP8393X=y
CONFIG_DS1225Y=y
CONFIG_MIPSNET=y CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_G364FB=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y CONFIG_ISA_TESTDEV=y
CONFIG_EMPTY_SLOT=y CONFIG_EMPTY_SLOT=y

1
default-configs/mips64-softmmu.mak
View File

@ -29,6 +29,7 @@ CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y
CONFIG_MIPSNET=y CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_JAZZ=y
CONFIG_G364FB=y CONFIG_G364FB=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_JAZZ_LED=y CONFIG_JAZZ_LED=y

1
default-configs/mips64el-softmmu.mak
View File

@ -31,6 +31,7 @@ CONFIG_DS1225Y=y
CONFIG_MIPSNET=y CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_FULONG=y CONFIG_FULONG=y
CONFIG_JAZZ=y
CONFIG_G364FB=y CONFIG_G364FB=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_JAZZ_LED=y CONFIG_JAZZ_LED=y

5
default-configs/mipsel-softmmu.mak
View File

@ -24,14 +24,9 @@ CONFIG_PIIX4=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_RC4030=y
CONFIG_DP8393X=y
CONFIG_DS1225Y=y
CONFIG_MIPSNET=y CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_G364FB=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y CONFIG_ISA_TESTDEV=y
CONFIG_EMPTY_SLOT=y CONFIG_EMPTY_SLOT=y

3
hw/mips/Makefile.objs
View File

@ -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-y += addr.o cputimer.o mips_int.o
obj-$(CONFIG_JAZZ) += mips_jazz.o
obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-$(CONFIG_FULONG) += mips_fulong2e.o
obj-y += gt64xxx_pci.o obj-y += gt64xxx_pci.o

5
hw/mips/mips_jazz.c
View File

@ -157,12 +157,7 @@ static void mips_jazz_init(MachineState *machine,
/* init CPUs */ /* init CPUs */
if (cpu_model == NULL) { if (cpu_model == NULL) {
#ifdef TARGET_MIPS64
cpu_model = "R4000"; 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); cpu = cpu_mips_init(cpu_model);
if (cpu == NULL) { if (cpu == NULL) {

2
tests/endianness-test.c
View File

@ -31,8 +31,6 @@ struct TestCase {
static const TestCase test_cases[] = { static const TestCase test_cases[] = {
{ "i386", "pc", -1 }, { "i386", "pc", -1 },
{ "mips", "magnum", 0x90000000, .bswap = true },
{ "mips", "pica61", 0x90000000, .bswap = true },
{ "mips", "mips", 0x14000000, .bswap = true }, { "mips", "mips", 0x14000000, .bswap = true },
{ "mips", "malta", 0x10000000, .bswap = true }, { "mips", "malta", 0x10000000, .bswap = true },
{ "mips64", "magnum", 0x90000000, .bswap = true }, { "mips64", "magnum", 0x90000000, .bswap = true },