[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/48] prep: Drop from ppcemb-softmmu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 02/48] prep: Drop from ppcemb-softmmu |
Date: |
Mon, 10 Feb 2014 19:36:19 +0100 |
From: Andreas Färber <address@hidden>
ppcemb covers only embedded processors, which does not include PReP.
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 | 5 -----
hw/ppc/Makefile.objs | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index f5cd0bd..f380ca4 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -41,6 +41,7 @@ CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
+CONFIG_PREP=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 fb34a9b..fcc0452 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -42,6 +42,7 @@ CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
CONFIG_PSERIES=y
+CONFIG_PREP=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 4411203..fdf1e14 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -10,11 +10,9 @@ CONFIG_VGA=y
CONFIG_VGA_PCI=y
CONFIG_SERIAL=y
CONFIG_I8254=y
-CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_I8257=y
CONFIG_OPENPIC=y
-CONFIG_PREP_PCI=y
CONFIG_MACIO=y
CONFIG_CUDA=y
CONFIG_ADB=y
@@ -38,6 +36,3 @@ CONFIG_XILINX_ETHLITE=y
CONFIG_OPENPIC=y
CONFIG_E500=y
CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
-# For PReP
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 7a1cd5d..2dd5284 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -8,7 +8,7 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o
obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o
obj-y += ppc4xx_pci.o
# PReP
-obj-y += prep.o
+obj-$(CONFIG_PREP) += prep.o
# OldWorld PowerMac
obj-y += mac_oldworld.o
# NewWorld PowerMac
--
1.8.4.5
- [Qemu-devel] [PULL 12/48] z2: QOM'ify AER915, (continued)
- [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, 2014/02/10
- [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 <=
- [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
- [Qemu-devel] [PULL 28/48] tests: Add ipoctal232 qtest, Andreas Färber, 2014/02/10