Signed-off-by: Hongmei Gou <[email protected]>
---
multimedia_apps/arm_multimedia_aacdec/runAACDec.sh | 4 ++--
multimedia_apps/arm_multimedia_audiocapture/runAudioCapture.sh | 4 ++--
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh | 4 ++--
multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 8 ++++----
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh
b/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh
index 2db214e..111d107 100644
--- a/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh
+++ b/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh
@@ -18,7 +18,7 @@ else
amixer cset name='HeadsetL Mixer AudioL1' on
amixer cset name='HeadsetR Mixer AudioR1' on
amixer -c 0 set Headset 1+ unmute
- elif [ "$machine_type" = "am335x-evm" ]; then
+ elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" =
"am335x-hs-evm" ]; then
amixer cset name='PCM Playback Volume' 127
elif [ "$machine_type" = "omap5-evm" ]; then
amixer cset name='PCM Playback Volume' 127
@@ -36,7 +36,7 @@ else
AUDIO_SINK="$AUDIO_SINK device=hw:$AUDIO_CARD,0"
amixer cset -c $AUDIO_CARD name='PCM Playback Volume' 127
fi
- elif [ "$machine_type" = "am437x-evm" ]; then
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" =
"am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
# EPOS uses a different configuration
# we are running on that board
diff --git a/multimedia_apps/arm_multimedia_audiocapture/runAudioCapture.sh
b/multimedia_apps/arm_multimedia_audiocapture/runAudioCapture.sh
index fe2e3ea..c7b2b3f 100755
--- a/multimedia_apps/arm_multimedia_audiocapture/runAudioCapture.sh
+++ b/multimedia_apps/arm_multimedia_audiocapture/runAudioCapture.sh
@@ -27,7 +27,7 @@ else
amixer cset name='Analog Left AUXL Capture Switch' 1 > /dev/null
amixer cset name='Analog Right AUXR Capture Switch' 1 > /dev/null
amixer sset 'Headset' 60%,60% > /dev/null
- elif [ "$machine_type" = "am335x-evm" ]; then
+ elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" =
"am335x-hs-evm" ]; then
amixer cset name='PCM Playback Volume' 80%,80% > /dev/null
amixer cset name='PGA Capture Volume' 65%,65% > /dev/null
amixer sset 'Right PGA Mixer Line1R' on > /dev/null
@@ -55,7 +55,7 @@ else
amixer -c BeagleBoardX15 sset 'Left PGA Mixer Mic2L' on
amixer -c BeagleBoardX15 sset 'Right PGA Mixer Mic2R' on
amixer -c BeagleBoardX15 sset 'PGA' 40
- elif [ "$machine_type" = "am437x-evm" ]; then
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" =
"am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
# EPOS uses a different configuration
# we are running on that board
model_name=`cat /proc/device-tree/model | grep -i epos`
diff --git a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
index 1377371..3f15084 100644
--- a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
+++ b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
@@ -1,7 +1,7 @@
#!/bin/sh
machine_type="`cat /etc/hostname`"
-if [ "$machine_type" = "am335x-evm" ]; then
+if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm"
]; then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
filename="/usr/share/ti/video/TearOfSteel-Short-400x240.264"
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264"
-elif [ "$machine_type" = "am437x-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm"
] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
diff --git a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
index 2d6f96e..f4a860e 100644
--- a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
@@ -6,7 +6,7 @@ if [ ! -f $amixer_find ]; then
echo "Please connect audio output and install ALSA soundcard driver"
else
machine_type="`cat /etc/hostname`"
- if [ "$machine_type" = "am335x-evm" ]; then
+ if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" =
"am335x-hs-evm" ]; then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
@@ -20,7 +20,7 @@ else
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
- elif [ "$machine_type" = "am437x-evm" ]
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" =
"am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
@@ -48,11 +48,11 @@ else
amixer cset name='HeadsetL Mixer AudioL1' on
amixer cset name='HeadsetR Mixer AudioR1' on
amixer -c 0 set Headset 1+ unmute
- elif [ "$machine_type" = "am335x-evm" ]; then
+ elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" =
"am335x-hs-evm" ]; then
amixer cset name='PCM Playback Volume' 127
elif [ "$machine_type" = "omap5-evm" ]; then
amixer cset name='PCM Playback Volume' 127
- elif [ "$machine_type" = "am437x-evm" ]; then
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" =
"am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
# EPOS uses a different configuration so check if
# we are running on that board
diff --git a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
index 2b7b3a6..92a44e0 100644
--- a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
@@ -1,7 +1,7 @@
#!/bin/sh
machine_type="`cat /etc/hostname`"
-if [ "$machine_type" = "am335x-evm" ]; then
+if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm"
]; then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
filename="/usr/share/ti/video/TearOfSteel-Short-400x240.m4v"
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v"
-elif [ "$machine_type" = "am437x-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm"
] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
--
1.9.1
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
