From: Thomas Huth <thuth@redhat.com>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/2] default-configs/ppc-softmmu: Restructure the switches according to the machines
Date: Mon, 15 Jan 2018 10:30:55 +0100 [thread overview]
Message-ID: <1516008655-31732-3-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1516008655-31732-1-git-send-email-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.
For the embedded part, we now also include ppcemb-softmmu.mak instead
of duplicating all the CONFIG switches again, to make sure that the
ppc-softmmu build always contains all switches from ppcemb-softmmu (e.g.
the switch CONFIG_IDE_SII3112 from ppcemb was missing in ppc-softmmu).
While we're at it, also remove the CONFIG_IDE_CMD646 since this controller
does not seem to be used by any ppc machine in QEMU.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/ppc-softmmu.mak | 59 +++++++++++++++++------------------------
1 file changed, 24 insertions(+), 35 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index bb225c6..460e6f4 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,26 +1,18 @@
# Default configuration for ppc-softmmu
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_PPC4XX=y
+# For embedded PPCs:
+include ppcemb-softmmu.mak
+CONFIG_E500=y
+CONFIG_ETSEC=y
+CONFIG_PLATFORM_BUS=y
+CONFIG_PPCE500_PCI=y
+CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
+
+# For Macs
+CONFIG_MAC=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
@@ -29,26 +21,23 @@ 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
+
# 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_FDC=y
+CONFIG_PCKBD=y
+CONFIG_NE2000_ISA=y
+CONFIG_PCSPK=y
+CONFIG_PC87312=y
+CONFIG_IDE_ISA=y
+CONFIG_CS4231A=y
--
1.8.3.1
next prev parent reply other threads:[~2018-01-15 9:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 9:30 [Qemu-devel] [PATCH 0/2] Clean up the ppc default configs Thomas Huth
2018-01-15 9:30 ` [Qemu-devel] [PATCH 1/2] default-configs/ppc64-softmmu: Include 32-bit configs instead of copying them Thomas Huth
2018-01-15 9:30 ` Thomas Huth [this message]
2018-01-15 11:05 ` [Qemu-devel] [Qemu-ppc] [PATCH 0/2] Clean up the ppc default configs Greg Kurz
2018-01-15 14:26 ` Thomas Huth
2018-01-15 12:00 ` BALATON Zoltan
2018-01-15 14:38 ` Thomas Huth
2018-01-16 10:41 ` Thomas Huth
2018-01-16 10:51 ` Peter Maydell
2018-01-16 11:10 ` Thomas Huth
2018-01-15 13:01 ` [Qemu-devel] " Peter Maydell
2018-01-15 14:42 ` [Qemu-devel] [Qemu-ppc] " Thomas Huth
2018-01-16 1:19 ` David Gibson
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=1516008655-31732-3-git-send-email-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).