[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/48] ppcemb-softmmu: Drop Mac and e500 emulation
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 03/48] ppcemb-softmmu: Drop Mac and e500 emulation |
Date: |
Mon, 10 Feb 2014 19:36:20 +0100 |
They are still available in ppc-softmmu and ppc64-softmmu.
Signed-off-by: Andreas Färber <address@hidden>
---
default-configs/ppc-softmmu.mak | 1 +
default-configs/ppc64-softmmu.mak | 1 +
default-configs/ppcemb-softmmu.mak | 20 --------------------
hw/ppc/Makefile.objs | 4 ++--
4 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index f380ca4..e5f9d36 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -42,6 +42,7 @@ CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
CONFIG_PREP=y
+CONFIG_MAC=y
CONFIG_E500=y
CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
# For PReP
diff --git a/default-configs/ppc64-softmmu.mak
b/default-configs/ppc64-softmmu.mak
index fcc0452..e2beac6 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -43,6 +43,7 @@ CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
CONFIG_PSERIES=y
CONFIG_PREP=y
+CONFIG_MAC=y
CONFIG_E500=y
CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
# For pSeries
diff --git a/default-configs/ppcemb-softmmu.mak
b/default-configs/ppcemb-softmmu.mak
index fdf1e14..1e4fde2 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,30 +3,12 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_ISA_MMIO=y
-CONFIG_ESCC=y
CONFIG_M48T59=y
CONFIG_VGA=y
CONFIG_VGA_PCI=y
CONFIG_SERIAL=y
-CONFIG_I8254=y
-CONFIG_FDC=y
CONFIG_I8257=y
CONFIG_OPENPIC=y
-CONFIG_MACIO=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
@@ -34,5 +16,3 @@ CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
-CONFIG_E500=y
-CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 2dd5284..ea747f0 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -10,9 +10,9 @@ obj-y += ppc4xx_pci.o
# PReP
obj-$(CONFIG_PREP) += prep.o
# OldWorld PowerMac
-obj-y += mac_oldworld.o
+obj-$(CONFIG_MAC) += mac_oldworld.o
# NewWorld PowerMac
-obj-y += mac_newworld.o
+obj-$(CONFIG_MAC) += mac_newworld.o
# e500
obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
--
1.8.4.5
- [Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled, (continued)
- [Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 10/48] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 12/48] z2: QOM'ify AER915, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 07/48] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 16/48] lm832x: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 14/48] ssd0303: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 06/48] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 19/48] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 05/48] qom-test: Run for all available machines, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 13/48] wm8750: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 03/48] ppcemb-softmmu: Drop Mac and e500 emulation,
Andreas Färber <=
- [Qemu-devel] [PULL 17/48] ds1338: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 02/48] prep: Drop from ppcemb-softmmu, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 04/48] target-ppc: Make ppc40x CPUs available in ppcemb, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 18/48] twl92230: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 20/48] tests: Add e1000 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 15/48] max7310: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 27/48] tests: Add tpci200 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 25/48] tests: Add ne2000 qtest, Andreas Färber, 2014/02/10