[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 02/12] default-configs/ppc-softmmu: Restructure the swi
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 02/12] default-configs/ppc-softmmu: Restructure the switches according to the machines |
Date: |
Sun, 21 Jan 2018 16:33:43 +1100 |
From: Thomas Huth <address@hidden>
Order the CONFIG switches in ppc-softmmu.mak according to the machine
classes where they are used (embedded, Mac or PReP), so that it is
easier for the users to disable a set of switches completely if they
are not needed.
Also add the missing CONFIG_IDE_SII3112 switch to the embedded section
which was previously only added to ppcemb-softmmu.mak.
And while we're at it, also remove the CONFIG_IDE_CMD646 switch since
this controller does not seem to be used by any ppc machine in QEMU.
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
default-configs/ppc-softmmu.mak | 59 ++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index bb225c6e46..3baed6a8fd 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,52 +3,57 @@
include pci.mak
include sound.mak
include usb.mak
+
+# For embedded PPCs:
CONFIG_PPC4XX=y
-CONFIG_ESCC=y
CONFIG_M48T59=y
CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
CONFIG_I8257=y
-CONFIG_I82374=y
CONFIG_OPENPIC=y
-CONFIG_PREP_PCI=y
-CONFIG_I82378=y
-CONFIG_PC87312=y
-CONFIG_MACIO=y
-CONFIG_SUNGEM=y
-CONFIG_PCSPK=y
-CONFIG_CS4231A=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
CONFIG_PPCE500_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
-CONFIG_IDE_MACIO=y
-CONFIG_NE2000_ISA=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
-CONFIG_PREP=y
-CONFIG_MAC=y
CONFIG_E500=y
CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
CONFIG_PLATFORM_BUS=y
CONFIG_ETSEC=y
CONFIG_SM501=y
+CONFIG_IDE_SII3112=y
+
+# For Macs
+CONFIG_MAC=y
+CONFIG_ESCC=y
+CONFIG_MACIO=y
+CONFIG_SUNGEM=y
+CONFIG_CUDA=y
+CONFIG_ADB=y
+CONFIG_MAC_NVRAM=y
+CONFIG_MAC_DBDMA=y
+CONFIG_HEATHROW_PIC=y
+CONFIG_GRACKLE_PCI=y
+CONFIG_UNIN_PCI=y
+CONFIG_DEC_PCI=y
+CONFIG_IDE_MACIO=y
+
# For PReP
+CONFIG_PREP=y
+CONFIG_PREP_PCI=y
CONFIG_SERIAL_ISA=y
CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_RS6000_MC=y
+CONFIG_PARALLEL=y
+CONFIG_I82374=y
+CONFIG_I82378=y
+CONFIG_I8254=y
+CONFIG_PCKBD=y
+CONFIG_FDC=y
+CONFIG_NE2000_ISA=y
+CONFIG_PC87312=y
+CONFIG_PCSPK=y
+CONFIG_IDE_ISA=y
+CONFIG_CS4231A=y
--
2.14.3
- [Qemu-ppc] [PULL 00/12] ppc-for-2.12 queue 20180121, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 01/12] default-configs/ppc64-softmmu: Include 32-bit configs instead of copying them, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 03/12] hw/ppc/Makefile: Add a way to disable the PPC4xx boards, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 02/12] default-configs/ppc-softmmu: Restructure the switches according to the machines,
David Gibson <=
- [Qemu-ppc] [PULL 08/12] target-ppc: optimize cmp translation, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 05/12] target/ppc: msgsnd and msgclr instructions need hypervisor privilege, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 06/12] spapr: drop duplicate variable in spapr_core_plug(), David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 07/12] spapr: fix device tree properties when using compatibility mode, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 09/12] sm501: Add missing break to case, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 04/12] target/ppc: fix doorbell and hypervisor doorbell definitions, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 10/12] sii3112: Add explicit type casts to avoid unintended sign extension, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 12/12] target/ppc/spapr_caps: Add macro to generate spapr_caps migration vmstate, David Gibson, 2018/01/21
- [Qemu-ppc] [PULL 11/12] target/ppc: add support for hypervisor doorbells on book3s CPUs, David Gibson, 2018/01/21
- Re: [Qemu-ppc] [PULL 00/12] ppc-for-2.12 queue 20180121, Peter Maydell, 2018/01/22