diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 14:30:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 14:30:20 +0000 |
| commit | 10805344811f794647b0b28f7409b319d60a7d67 (patch) | |
| tree | 77614347cf8cc061677b1d69ede7b0001d754396 /default-configs/mips64-softmmu.mak | |
| parent | 4f57a35d81386df8840fd968251f44a95fc0f949 (diff) | |
| parent | b7c4ab809a4bfde4ab322b49fbe2e47536da7487 (diff) | |
| download | qemu-10805344811f794647b0b28f7409b319d60a7d67.zip qemu-10805344811f794647b0b28f7409b319d60a7d67.tar.gz qemu-10805344811f794647b0b28f7409b319d60a7d67.tar.bz2 | |
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160323' into staging
MIPS patches 2016-03-23
Changes:
* add mips-softmmu-common.mak
* indicate presence of IEEE 754-2008 FPU in MIPS64R6-generic and P5600
# gpg: Signature made Wed 23 Mar 2016 16:38:04 GMT using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
* remotes/lalrae/tags/mips-20160323:
default-configs: add mips-softmmu-common.mak
target-mips: indicate presence of IEEE 754-2008 FPU in R6/R5+MSA CPUs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'default-configs/mips64-softmmu.mak')
| -rw-r--r-- | default-configs/mips64-softmmu.mak | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 66ed5f9..bad7496 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -1,38 +1,9 @@ # Default configuration for mips64-softmmu -include pci.mak -include sound.mak -include usb.mak -CONFIG_ESP=y -CONFIG_VGA_ISA=y -CONFIG_VGA_ISA_MM=y -CONFIG_VGA_CIRRUS=y -CONFIG_VMWARE_VGA=y -CONFIG_SERIAL=y -CONFIG_PARALLEL=y -CONFIG_I8254=y -CONFIG_PCSPK=y -CONFIG_PCKBD=y -CONFIG_FDC=y -CONFIG_ACPI=y -CONFIG_ACPI_X86=y -CONFIG_ACPI_MEMORY_HOTPLUG=y -CONFIG_ACPI_CPU_HOTPLUG=y -CONFIG_APM=y -CONFIG_I8257=y -CONFIG_PIIX4=y -CONFIG_IDE_ISA=y -CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y +include mips-softmmu-common.mak CONFIG_RC4030=y 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 -CONFIG_MC146818RTC=y -CONFIG_ISA_TESTDEV=y -CONFIG_EMPTY_SLOT=y |