[RESEND,for,1.2] audio: Make pcspk card selectable again

Submitted by Jan Kiszka on Aug. 16, 2012, 9:01 a.m.

Details

Message ID 502CB6D7.6040505@siemens.com
State New
Headers show

Commit Message

Jan Kiszka Aug. 16, 2012, 9:01 a.m.
Since we moved pcspk into hwlib, CONFIG_PCSPK is no longer defined per
target. Therefore, statically built soundhw array in arch_init.c stopped
including this card.

Work around this by re-adding this define to config-target.mak.
Long-term, a dynamic creation of this soundhw list will be necessary.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 configure |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Comments

malc Aug. 16, 2012, 2:53 p.m.
On Thu, 16 Aug 2012, Jan Kiszka wrote:

> Since we moved pcspk into hwlib, CONFIG_PCSPK is no longer defined per
> target. Therefore, statically built soundhw array in arch_init.c stopped
> including this card.
> 
> Work around this by re-adding this define to config-target.mak.
> Long-term, a dynamic creation of this soundhw list will be necessary.
> 

Thanks, applied.

[..snip..]

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index be292fe..672da59 100755
--- a/configure
+++ b/configure
@@ -3902,6 +3902,11 @@  if test "$target_bsd_user" = "yes" ; then
   echo "CONFIG_BSD_USER=y" >> $config_target_mak
 fi
 
+# the static way of configuring available audio cards requires this workaround
+if test "$target_user_only" != "yes" && grep -q CONFIG_PCSPK $source_path/default-configs/$target.mak; then
+  echo "CONFIG_PCSPK=y" >> $config_target_mak
+fi
+
 # generate QEMU_CFLAGS/LDFLAGS for targets
 
 cflags=""