From: David Gibson <david@gibson.dropbear.id.au>
To: peter.maydell@linaro.org
Cc: groug@kaod.org, surajjs@au1.ibm.com, lvivier@redhat.com,
agraf@suse.de, qemu-ppc@nognu.org, qemu-devel@nongnu.org,
Thomas Huth <thuth@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PULL 02/13] default-configs/ppc-softmmu: Restructure the switches according to the machines
Date: Fri, 19 Jan 2018 20:40:04 +1100 [thread overview]
Message-ID: <20180119094015.28266-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20180119094015.28266-1-david@gibson.dropbear.id.au>
From: Thomas Huth <thuth@redhat.com>
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 <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
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
next prev parent reply other threads:[~2018-01-19 9:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-19 9:40 [Qemu-devel] [PULL 00/13] ppc-for-2.12 queue 20180119 David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 01/13] default-configs/ppc64-softmmu: Include 32-bit configs instead of copying them David Gibson
2018-01-19 9:40 ` David Gibson [this message]
2018-01-19 9:40 ` [Qemu-devel] [PULL 03/13] hw/ppc/Makefile: Add a way to disable the PPC4xx boards David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 04/13] ppc: Deprecate qemu-system-ppcemb David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 05/13] target/ppc: fix doorbell and hypervisor doorbell definitions David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 06/13] target/ppc: msgsnd and msgclr instructions need hypervisor privilege David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 07/13] spapr: drop duplicate variable in spapr_core_plug() David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 08/13] spapr: fix device tree properties when using compatibility mode David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 09/13] target-ppc: optimize cmp translation David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 10/13] sm501: Add missing break to case David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 11/13] sii3112: Add explicit type casts to avoid unintended sign extension David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 12/13] target/ppc: add support for hypervisor doorbells on book3s CPUs David Gibson
2018-01-19 9:40 ` [Qemu-devel] [PULL 13/13] target/ppc/spapr_caps: Add macro to generate spapr_caps migration vmstate David Gibson
2018-01-19 14:11 ` [Qemu-devel] [PULL 00/13] ppc-for-2.12 queue 20180119 Peter Maydell
2018-01-19 14:58 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180119094015.28266-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nognu.org \
--cc=surajjs@au1.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).