From 19e0bed593a9e090e3da9bc9ceb7b9c0499951dd Mon Sep 17 00:00:00 2001 From: Binbin Wu Date: Mon, 15 Oct 2018 17:09:21 +0800 Subject: [PATCH] script: re-enable audio passthru This reverts partial of commit: 9bf5aafe "script: workarounds for UOS of 4.19-rc kernel", since our fixing patch for kernel crash when audio passthru is ready. Tracked-On:#1461 Signed-off-by: Binbin Wu Reviewed-by: Yin Fengwei --- devicemodel/samples/apl-mrb/launch_uos.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index 86cdcc24c..ecdaeec04 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -298,12 +298,6 @@ else GVT_args='' fi -if [ "$kernel_version" = "4.19" ]; then - audio_option='' -else - audio_option='-s 14,passthru,0/e/0,keep_gsi' -fi - acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio $npk_virt\ -s 9,virtio-net,$tap \ -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ @@ -312,7 +306,7 @@ fi -s 13,virtio-rpmb \ -s 10,virtio-hyper_dmabuf \ -s 11,wdt-i6300esb \ - $audio_option \ + -s 14,passthru,0/e/0,keep_gsi \ -s 23,passthru,0/17/0 \ -s 15,passthru,0/f/0 \ -s 27,passthru,0/1b/0 \ @@ -380,7 +374,7 @@ if [ $launch_type == 6 ]; then elif [ -f "/data/alios/alios.img" ]; then launch_type=5; else - launch_type=1; + launch_type=1; fi fi