diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 3 | ||||
-rw-r--r-- | recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio | 42 | ||||
-rw-r--r-- | recipes-bsp/imx-audio/imx-audio/mx5/imx-audio | 44 | ||||
-rw-r--r-- | recipes-bsp/imx-audio/imx-audio/mx6/imx-audio | 44 | ||||
-rw-r--r-- | recipes-bsp/imx-audio/imx-audio_0.1.bb | 33 |
5 files changed, 1 insertions, 165 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index bea3970..beeee5f 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -66,8 +66,7 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" | |||
66 | 66 | ||
67 | # Extra audio support | 67 | # Extra audio support |
68 | # FIXME: Add support for ALL SoC families | 68 | # FIXME: Add support for ALL SoC families |
69 | MACHINE_EXTRA_RRECOMMENDS_append_mx5 = " imx-audio" | 69 | MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " fsl-alsa-plugins" |
70 | MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " imx-audio fsl-alsa-plugins" | ||
71 | 70 | ||
72 | # Extra udev rules | 71 | # Extra udev rules |
73 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" | 72 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" |
diff --git a/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio b/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio deleted file mode 100644 index e2c3cc8..0000000 --- a/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio +++ /dev/null | |||
@@ -1,42 +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 | |||
13 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
14 | DESC="Audio mixer settings" | ||
15 | NAME=imx-audio | ||
16 | AMIXER=`which amixer` | ||
17 | SCRIPTNAME=/etc/init.d/$NAME | ||
18 | |||
19 | # Exit if amixer is not installed | ||
20 | [ -x "$AMIXER" ] || exit 0 | ||
21 | |||
22 | do_start() { | ||
23 | # Enable the Headset (Audio Out) | ||
24 | $AMIXER sset "Headset" 2 > /dev/null | ||
25 | $AMIXER sset "HeadsetL Mixer AudioL1" on > /dev/null | ||
26 | $AMIXER sset "HeadsetR Mixer AudioR1" on > /dev/null | ||
27 | } | ||
28 | |||
29 | case "$1" in | ||
30 | start) | ||
31 | echo "$NAME: setting default mixer settings." | ||
32 | do_start | ||
33 | ;; | ||
34 | stop) | ||
35 | ;; | ||
36 | *) | ||
37 | echo "Usage: $SCRIPTNAME {start|stop}" >&2 | ||
38 | exit 3 | ||
39 | ;; | ||
40 | esac | ||
41 | |||
42 | exit 0 | ||
diff --git a/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio b/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio deleted file mode 100644 index dde6930..0000000 --- a/recipes-bsp/imx-audio/imx-audio/mx5/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 | |||
13 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
14 | DESC="Audio mixer settings" | ||
15 | NAME=imx-audio | ||
16 | AMIXER=`which amixer` | ||
17 | SCRIPTNAME=/etc/init.d/$NAME | ||
18 | |||
19 | # Exit if amixer is not installed | ||
20 | [ -x "$AMIXER" ] || exit 0 | ||
21 | |||
22 | do_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 | |||
31 | case "$1" in | ||
32 | start) | ||
33 | echo "$NAME: setting default mixer settings." | ||
34 | do_start | ||
35 | ;; | ||
36 | stop) | ||
37 | ;; | ||
38 | *) | ||
39 | echo "Usage: $SCRIPTNAME {start|stop}" >&2 | ||
40 | exit 3 | ||
41 | ;; | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||
diff --git a/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio b/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio deleted file mode 100644 index dde6930..0000000 --- a/recipes-bsp/imx-audio/imx-audio/mx6/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 | |||
13 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
14 | DESC="Audio mixer settings" | ||
15 | NAME=imx-audio | ||
16 | AMIXER=`which amixer` | ||
17 | SCRIPTNAME=/etc/init.d/$NAME | ||
18 | |||
19 | # Exit if amixer is not installed | ||
20 | [ -x "$AMIXER" ] || exit 0 | ||
21 | |||
22 | do_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 | |||
31 | case "$1" in | ||
32 | start) | ||
33 | echo "$NAME: setting default mixer settings." | ||
34 | do_start | ||
35 | ;; | ||
36 | stop) | ||
37 | ;; | ||
38 | *) | ||
39 | echo "Usage: $SCRIPTNAME {start|stop}" >&2 | ||
40 | exit 3 | ||
41 | ;; | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||
diff --git a/recipes-bsp/imx-audio/imx-audio_0.1.bb b/recipes-bsp/imx-audio/imx-audio_0.1.bb deleted file mode 100644 index 3cdc1af..0000000 --- a/recipes-bsp/imx-audio/imx-audio_0.1.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | SUMMARY = "Provide a basic init script to enable audio" | ||
2 | DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot." | ||
3 | SECTION = "base" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | ||
6 | |||
7 | PR = "r4" | ||
8 | |||
9 | inherit update-rc.d | ||
10 | |||
11 | RDEPENDS_${PN} = "alsa-utils-amixer" | ||
12 | |||
13 | SRC_URI = "file://imx-audio" | ||
14 | |||
15 | INITSCRIPT_NAME = "imx-audio" | ||
16 | INITSCRIPT_PARAMS = "defaults 90" | ||
17 | |||
18 | COMPATIBLE_MACHINE = "(mx5|mx6)" | ||
19 | INHIBIT_DEFAULT_DEPS = "1" | ||
20 | |||
21 | do_install() { | ||
22 | install -d ${D}${sysconfdir} \ | ||
23 | ${D}${sysconfdir}/init.d | ||
24 | install -m 0755 ${WORKDIR}/imx-audio ${D}${sysconfdir}/init.d | ||
25 | cat ${WORKDIR}/${INITSCRIPT_NAME} | \ | ||
26 | sed -e 's,/etc,${sysconfdir},g' \ | ||
27 | -e 's,/usr/sbin,${sbindir},g' \ | ||
28 | -e 's,/var,${localstatedir},g' \ | ||
29 | -e 's,/usr/bin,${bindir},g' \ | ||
30 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} | ||
31 | chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} | ||
32 | } | ||
33 | |||