[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines with kconfig |
Date: |
Thu, 7 Feb 2019 18:57:15 +0100 |
From: Thomas Huth <address@hidden>
This will make it for example easier if the users want to disable
one of the two machines for their builds.
Cc: Mark Cave-Ayland <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/ppc-softmmu.mak | 15 ---------------
hw/misc/Kconfig | 6 ++++++
hw/net/Kconfig | 1 +
hw/pci-host/Kconfig | 4 +++-
hw/ppc/Kconfig | 15 +++++++++++++++
5 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 066cec9..caaff60 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=y
CONFIG_SMBUS_EEPROM=y
# For Macs
-CONFIG_ESCC=y
-CONFIG_MACIO=y
-CONFIG_MACIO_GPIO=y
-CONFIG_SUNGEM=y
-CONFIG_MOS6522=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_MAC_PMU=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_IDE_MACIO=y
CONFIG_MAC_OLDWORLD=y
CONFIG_MAC_NEWWORLD=y
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 74031cc..728c561 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -57,6 +57,12 @@ config MOS6522
config MACIO
bool
+ select CUDA
+ select ESCC
+ select IDE_MACIO
+ select MAC_DBDMA
+ select MAC_NVRAM
+ select MOS6522
config IVSHMEM_DEVICE
bool
diff --git a/hw/net/Kconfig b/hw/net/Kconfig
index dc69e55..1aa1071 100644
--- a/hw/net/Kconfig
+++ b/hw/net/Kconfig
@@ -86,6 +86,7 @@ config FTGMAC100
config SUNGEM
bool
+ depends on PCI
config COLDFIRE
bool
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index ff4080c..b39ea29 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -10,8 +10,10 @@ config GRACKLE_PCI
bool
config UNIN_PCI
- select PCI
bool
+ select PCI
+ select DEC_PCI
+ select OPENPIC
config PPCE500_PCI
select PCI
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 9cebf0f..fb77151 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -55,9 +55,24 @@ config RS6000_MC
config MAC_OLDWORLD
bool
+ imply PCI_DEVICES
+ imply SUNGEM
+ imply TEST_DEVICES
+ select ADB
+ select GRACKLE_PCI
+ select HEATHROW_PIC
+ select MACIO
config MAC_NEWWORLD
bool
+ imply PCI_DEVICES
+ imply SUNGEM
+ imply TEST_DEVICES
+ select ADB
+ select MACIO
+ select MACIO_GPIO
+ select MAC_PMU
+ select UNIN_PCI
config E500
bool
--
1.8.3.1
- [Qemu-devel] [PATCH 28/51] ipmi: express dependencies with kconfig, (continued)
- [Qemu-devel] [PATCH 28/51] ipmi: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 22/51] vfio: express vfio dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 23/51] virtio: express virtio dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 25/51] isa: express SuperIO dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 26/51] ssi: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 29/51] i386-softmmu.mak: remove all CONFIG_* except boards definitions, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 31/51] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 30/51] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines with kconfig,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 33/51] ppc: Express dependencies of the Sam460EX machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 34/51] ppc: Express dependencies of the embedded machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 35/51] alpha-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 39/51] m68k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 38/51] lm32-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 43/51] or1k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 36/51] cris-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 37/51] hppa-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07