[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards con
From: |
Yang Zhong |
Subject: |
[Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* |
Date: |
Thu, 31 Jan 2019 15:32:18 +0800 |
From: Ákos Kovács <address@hidden>
CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD
and CONFIG_VIRTEX configuration options created for
default-configs/ppc*-softmmu.mak.
Signed-off-by: Ákos Kovács <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Yang Zhong <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
default-configs/ppc-softmmu.mak | 7 ++++++-
hw/ppc/Makefile.objs | 11 ++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 23d871fb3e..7f80f0ccba 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -21,6 +21,10 @@ CONFIG_E500=y
CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
CONFIG_PLATFORM_BUS=y
CONFIG_ETSEC=y
+CONFIG_PPC405=y
+CONFIG_PPC440=y
+CONFIG_VIRTEX=y
+
# For Sam460ex
CONFIG_SAM460EX=y
CONFIG_USB_EHCI_SYSBUS=y
@@ -34,7 +38,6 @@ CONFIG_M41T80=y
CONFIG_VGA_CIRRUS=y
# For Macs
-CONFIG_MAC=y
CONFIG_ESCC=y
CONFIG_MACIO=y
CONFIG_MACIO_GPIO=y
@@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=y
CONFIG_UNIN_PCI=y
CONFIG_DEC_PCI=y
CONFIG_IDE_MACIO=y
+CONFIG_MAC_OLDWORLD=y
+CONFIG_MAC_NEWWORLD=y
# For PReP
CONFIG_PREP=y
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 4e0c1c0941..7d815b7d57 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -14,19 +14,20 @@ endif
obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
# PowerPC 4xx boards
obj-y += ppc4xx_devs.o ppc405_uc.o
-obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o
-obj-$(CONFIG_PPC4XX) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
+obj-$(CONFIG_PPC405) += ppc405_boards.o
+obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
+obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o
obj-$(CONFIG_SAM460EX) += sam460ex.o
# PReP
obj-$(CONFIG_PREP) += prep.o
obj-$(CONFIG_PREP) += prep_systemio.o
obj-${CONFIG_RS6000_MC} += rs6000_mc.o
# OldWorld PowerMac
-obj-$(CONFIG_MAC) += mac_oldworld.o
+obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o
# NewWorld PowerMac
-obj-$(CONFIG_MAC) += mac_newworld.o
+obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o
# e500
obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
-obj-$(CONFIG_XILINX) += virtex_ml507.o
+obj-$(CONFIG_VIRTEX) += virtex_ml507.o
--
2.17.1
- [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs, (continued)
- [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 05/27] build: actually use CONFIG_PAM, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 08/27] hw/m68k/Makefile.objs: Conditionally build boards, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*,
Yang Zhong <=
- [Qemu-devel] [PATCH v1 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards, Yang Zhong, 2019/01/31
- [Qemu-devel] [PATCH v1 17/27] hw/nios2/Makefile.objs: Conditionally build nios2, Yang Zhong, 2019/01/31