[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e5
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/ |
Date: |
Tue, 5 Mar 2013 18:17:38 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 3 ---
default-configs/ppc-softmmu.mak | 1 +
default-configs/ppc64-softmmu.mak | 2 ++
default-configs/ppcemb-softmmu.mak | 1 +
hw/ppc/Makefile.objs | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 8fdc2cf..ae3d9c5 100755
--- a/configure
+++ b/configure
@@ -4144,9 +4144,6 @@ case "$target_arch2" in
i386|x86_64)
echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak
esac
-if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then
- echo "CONFIG_PSERIES=y" >> $config_target_mak
-fi
if test "$target_bigendian" = "yes" ; then
echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
fi
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index f9f8a81..c209a8d 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
+CONFIG_E500=$(CONFIG_FDT)
diff --git a/default-configs/ppc64-softmmu.mak
b/default-configs/ppc64-softmmu.mak
index dc44294..8d490bd 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
+CONFIG_PSERIES=$(CONFIG_FDT)
+CONFIG_E500=$(CONFIG_FDT)
diff --git a/default-configs/ppcemb-softmmu.mak
b/default-configs/ppcemb-softmmu.mak
index 1c6bcf9..7f13421 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
+CONFIG_E500=$(CONFIG_FDT)
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index bbbe78e..9141373 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -11,7 +11,7 @@ obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o
obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
obj-y += ppc440_bamboo.o
# PowerPC E500 boards
-obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o
+obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
obj-y += virtex_ml507.o
# PowerPC OpenPIC
@@ -29,4 +29,4 @@ obj-y += mac_oldworld.o
# NewWorld PowerMac
obj-y += mac_newworld.o
# e500
-obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o
+obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
--
1.8.1.2
- [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 02/18] hw: move fifo.[ch] to libqemuutil, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 05/18] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 03/18] hw: move qdev-monitor.o to toplevel directory, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 07/18] vt82c686: vt82c686 is not a PCI host bridge, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 01/18] hw: move char backends to backends/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 06/18] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 13/18] arm: move files referencing CPU to hw/arm/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 14/18] i386: move files referencing CPU to hw/i386/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 17/18] ppc: move more files to hw/ppc, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 15/18] m68k: move files referencing CPU to hw/m68k/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 12/18] hw: move boards and other isolated files to hw/ARCH, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 18/18] sh: move files referencing CPU to hw/sh4/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 09/18] hw: include hw header files with full paths, Paolo Bonzini, 2013/03/05
- Re: [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/09