Re: [Qemu-devel] [PATCH v3 01/16] mips jazz: compile only in 64 bit

[Aurelien Jarno]

On 2015-06-03 22:45, Hervé Poussineau wrote:
> Remove now useless device models from other MIPS configurations
> 
> We're now compiling 12 files less than before.
> 
> Signed-off-by: Hervé Poussineau <address@hidden>
> ---
>  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-softmmu.mak
> index fd0607d..44467c3 100644
> --- a/default-configs/mips-softmmu.mak
> +++ b/default-configs/mips-softmmu.mak
> @@ -24,14 +24,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 b8c7910..66ed5f9 100644
> --- a/default-configs/mips64-softmmu.mak
> +++ b/default-configs/mips64-softmmu.mak
> @@ -29,6 +29,7 @@ CONFIG_DP8393X=y
>  CONFIG_DS1225Y=y
>  CONFIG_MIPSNET=y
>  CONFIG_PFLASH_CFI01=y
> +CONFIG_JAZZ=y
>  CONFIG_G364FB=y
>  CONFIG_I8259=y
>  CONFIG_JAZZ_LED=y
> diff --git a/default-configs/mips64el-softmmu.mak 
> b/default-configs/mips64el-softmmu.mak
> index ae4274b..bfca2b2 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -31,6 +31,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 1e2374b..0162ef0 100644
> --- a/default-configs/mipsel-softmmu.mak
> +++ b/default-configs/mipsel-softmmu.mak
> @@ -24,14 +24,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..26ee734 100644
> --- a/tests/endianness-test.c
> +++ b/tests/endianness-test.c
> @@ -31,8 +31,6 @@ 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 },

Reviewed-by: Aurelien Jarno <address@hidden>

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
address@hidden                 http://www.aurel32.net