summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-05-17 02:59:12 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-05-17 22:48:00 -0300
commitf65f28e0221ad472bd6f22f902c1677d47daaf75 (patch)
treea204dbe1a75ab94a7c28fc03c877457d5b548ede
parent7dc606d3ce39c0e2b003e194e8091fb76ef1aaa9 (diff)
downloadmeta-fsl-arm-f65f28e0221ad472bd6f22f902c1677d47daaf75.tar.gz
imx-audio: merge common files in SoC family ones
We provide mx5 and mx6 configurations leaving imx53ard as the only exception. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio44
-rw-r--r--recipes-bsp/imx-audio/imx-audio/mx5/imx-audio (renamed from recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio)0
-rw-r--r--recipes-bsp/imx-audio/imx-audio/mx6/imx-audio (renamed from recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio)0
-rw-r--r--recipes-bsp/imx-audio/imx-audio_0.1.bb2
4 files changed, 1 insertions, 45 deletions
diff --git a/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio b/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio
deleted file mode 100644
index dde6930..0000000
--- a/recipes-bsp/imx-audio/imx-audio/imx6qsabrelite/imx-audio
+++ /dev/null
@@ -1,44 +0,0 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: imx mixer setup
4# Required-Start: $syslog
5# Required-Stop: $syslog
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Initialize the imx audio mixer
9# Description: Unmute FRONT and set volume to ~70%.
10### END INIT INFO
11# Based on /etc/init.d/skeleton
12
13PATH=/sbin:/usr/sbin:/bin:/usr/bin
14DESC="Audio mixer settings"
15NAME=imx-audio
16AMIXER=`which amixer`
17SCRIPTNAME=/etc/init.d/$NAME
18
19# Exit if amixer is not installed
20[ -x "$AMIXER" ] || exit 0
21
22do_start() {
23 # Enable the Headset (Audio Out)
24 $AMIXER sset "Headphone" 120 > /dev/null
25 $AMIXER sset "Speaker Function" on > /dev/null
26 $AMIXER sset "Playback" 140 > /dev/null
27 $AMIXER sset "Capture" 15 > /dev/null
28 $AMIXER sset "Jack Function" on > /dev/null
29}
30
31case "$1" in
32start)
33 echo "$NAME: setting default mixer settings."
34 do_start
35 ;;
36stop)
37 ;;
38*)
39 echo "Usage: $SCRIPTNAME {start|stop}" >&2
40 exit 3
41 ;;
42esac
43
44exit 0
diff --git a/recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio b/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
index dde6930..dde6930 100644
--- a/recipes-bsp/imx-audio/imx-audio/imx51evk/imx-audio
+++ b/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
diff --git a/recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio b/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
index dde6930..dde6930 100644
--- a/recipes-bsp/imx-audio/imx-audio/imx53qsb/imx-audio
+++ b/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
diff --git a/recipes-bsp/imx-audio/imx-audio_0.1.bb b/recipes-bsp/imx-audio/imx-audio_0.1.bb
index bafa92b..2dc0ecb 100644
--- a/recipes-bsp/imx-audio/imx-audio_0.1.bb
+++ b/recipes-bsp/imx-audio/imx-audio_0.1.bb
@@ -4,7 +4,7 @@ SECTION = "base"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
6 6
7PR = "r3" 7PR = "r4"
8 8
9inherit update-rc.d 9inherit update-rc.d
10 10