[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/54] build: convert sound.mak to Kconfig
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 16/54] build: convert sound.mak to Kconfig |
Date: |
Mon, 4 Mar 2019 19:19:36 +0100 |
There is really nothing special in these devices; they are just
ISA devices. Instead of including them for each target,
set CONFIG_ISA_BUS to true, and make the devices default to present
whenever ISA is available. More conversion of ISA devices will
follow.
Done with the following script:
while read i; do
i=${i%=y}; i=${i#CONFIG_}
sed -i -e'/^config '$i'$/!b' -en \
-e'a\' -e' default y\' -e' depends on ISA_BUS' \
`grep -lw $i hw/*/Kconfig`
done < default-configs/sound.mak
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/i386-softmmu.mak | 2 +-
default-configs/mips-softmmu-common.mak | 2 +-
default-configs/ppc-softmmu.mak | 2 +-
default-configs/sound.mak | 4 ----
hw/audio/Kconfig | 8 ++++++++
5 files changed, 11 insertions(+), 7 deletions(-)
delete mode 100644 default-configs/sound.mak
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index b4dc3a0..075d501 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -2,7 +2,7 @@
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
-include sound.mak
+CONFIG_ISA_BUS=y
include usb.mak
include hyperv.mak
CONFIG_TEST_DEVICES=y
diff --git a/default-configs/mips-softmmu-common.mak
b/default-configs/mips-softmmu-common.mak
index 9c2146e..6d5882b 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -1,7 +1,7 @@
# Common mips*-softmmu CONFIG defines
-include sound.mak
include usb.mak
+CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_ESP=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 74e31a6..1871185 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,7 +1,7 @@
# Default configuration for ppc-softmmu
-include sound.mak
include usb.mak
+CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_TEST_DEVICES=y
diff --git a/default-configs/sound.mak b/default-configs/sound.mak
deleted file mode 100644
index 4f22c34..0000000
--- a/default-configs/sound.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_SB16=y
-CONFIG_ADLIB=y
-CONFIG_GUS=y
-CONFIG_CS4231A=y
diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig
index 6517e90..01aea55 100644
--- a/hw/audio/Kconfig
+++ b/hw/audio/Kconfig
@@ -1,5 +1,7 @@
config SB16
bool
+ default y
+ depends on ISA_BUS
config ES1370
bool
@@ -13,12 +15,18 @@ config AC97
config ADLIB
bool
+ default y
+ depends on ISA_BUS
config GUS
bool
+ default y
+ depends on ISA_BUS
config CS4231A
bool
+ default y
+ depends on ISA_BUS
config HDA
bool
--
1.8.3.1
- [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton, (continued)
- [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, 2019/03/04
- [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 <=
- [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
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Andrea Bolognani, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Paolo Bonzini, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Michael S. Tsirkin, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, David Abdurachmanov, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Paolo Bonzini, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Markus Armbruster, 2019/03/14
- Re: [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Paolo Bonzini, 2019/03/14
[Qemu-devel] [PULL 18/54] build: convert usb.mak to Kconfig, Paolo Bonzini, 2019/03/04