[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig |
Date: |
Mon, 4 Mar 2019 19:19:32 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/alpha-softmmu.mak | 2 --
default-configs/hppa-softmmu.mak | 1 -
default-configs/pci.mak | 3 ---
default-configs/sparc64-softmmu.mak | 1 -
hw/ide/Kconfig | 15 +++++++++++++++
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/default-configs/alpha-softmmu.mak
b/default-configs/alpha-softmmu.mak
index 74501ca..3fd656e 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -11,8 +11,6 @@ CONFIG_PARALLEL=y
CONFIG_FDC=y
CONFIG_PCKBD=y
CONFIG_VGA_CIRRUS=y
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
CONFIG_VMWARE_VGA=y
CONFIG_IDE_CMD646=y
CONFIG_I8259=y
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index b594a6d..e0a6cdc 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -5,7 +5,6 @@ CONFIG_SERIAL_ISA=y
CONFIG_ISA_BUS=y
CONFIG_I8259=y
CONFIG_E1000_PCI=y
-CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
# CONFIG_IDE_MMIO=y
CONFIG_VIRTIO_VGA=y
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index ac01909..fc5edfc 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -23,9 +23,6 @@ CONFIG_MPTSAS_SCSI_PCI=y
CONFIG_RTL8139_PCI=y
CONFIG_E1000_PCI=y
CONFIG_E1000E_PCI_EXPRESS=y
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
CONFIG_AHCI=y
CONFIG_ESP=y
CONFIG_ESP_PCI=y
diff --git a/default-configs/sparc64-softmmu.mak
b/default-configs/sparc64-softmmu.mak
index 415d4e0..b17513b 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -9,7 +9,6 @@ CONFIG_SERIAL_ISA=y
CONFIG_PARALLEL=y
CONFIG_PCKBD=y
CONFIG_FDC=y
-CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_PCI_SABRE=y
CONFIG_SIMBA=y
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index 5ec4495..fe27705 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -3,33 +3,48 @@ config IDE_CORE
config IDE_QDEV
bool
+ select IDE_CORE
config IDE_PCI
bool
+ select IDE_CORE
config IDE_ISA
bool
+ select IDE_QDEV
config IDE_PIIX
bool
+ select IDE_PCI
+ select IDE_QDEV
config IDE_CMD646
bool
+ select IDE_PCI
+ select IDE_QDEV
config IDE_MACIO
bool
+ select IDE_QDEV
config IDE_MMIO
bool
+ select IDE_QDEV
config IDE_VIA
bool
+ select IDE_PCI
+ select IDE_QDEV
config MICRODRIVE
bool
+ select IDE_QDEV
config AHCI
bool
+ select IDE_QDEV
config IDE_SII3112
bool
+ select IDE_PCI
+ select IDE_QDEV
--
1.8.3.1
- [Qemu-devel] [PULL 00/54] Kconfig conversion, excluding ARM and MIPS, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 05/54] minikconfig: add AST, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 10/54] minikconfig: implement allnoconfig and defconfig modes, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 06/54] minikconfig: add semantic analysis, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 07/54] hw/display: make edid configurable, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig,
Paolo Bonzini <=
- [Qemu-devel] [PULL 14/54] isa: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 09/54] build: switch to Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 11/54] kconfig: introduce CONFIG_TEST_DEVICES, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 13/54] hw/pci/Makefile.objs: make pcie configurable, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 08/54] kconfig: introduce kconfig files, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 16/54] build: convert sound.mak to Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 17/54] scsi: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Paolo Bonzini, 2019/03/04