diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-23 14:56:05 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | bcb129b3154ba743f8e52c21c331a0dfcaee7c38 (patch) | |
| tree | b0e14312ce4ff29cbf0897b83390bf643bc16cc7 | |
| parent | 7c28b925b7e176b4e44ed05d23cf883561000546 (diff) | |
| download | qemu-bcb129b3154ba743f8e52c21c331a0dfcaee7c38.zip qemu-bcb129b3154ba743f8e52c21c331a0dfcaee7c38.tar.gz qemu-bcb129b3154ba743f8e52c21c331a0dfcaee7c38.tar.bz2 | |
build: convert sound.mak to Kconfig
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 <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-32-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/mips-softmmu-common.mak | 2 | ||||
| -rw-r--r-- | default-configs/ppc-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/sound.mak | 4 | ||||
| -rw-r--r-- | hw/audio/Kconfig | 8 |
5 files changed, 11 insertions, 7 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 80c4b49..db841b6 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 88f28e5..4a48960 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 f47c069..f1d06f4 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 aa5c82b..dedb513 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 |