5 files changed, 1 insertions, 165 deletions

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index bea397017..beeee5fc6 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -66,8 +66,7 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
 # Extra audio support
 # FIXME: Add support for ALL SoC families
-MACHINE_EXTRA_RRECOMMENDS_append_mx5 = " imx-audio"
-MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " imx-audio fsl-alsa-plugins"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " fsl-alsa-plugins"
 
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio
deleted file mode 100644
index e2c3cc867..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/imx53ard/imx-audio
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          imx mixer setup
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Initialize the imx audio mixer
-# Description:       Unmute FRONT and set volume to ~70%.
-### END INIT INFO
-# Based on /etc/init.d/skeleton
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Audio mixer settings"
-NAME=imx-audio
-AMIXER=`which amixer`
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if amixer is not installed
-[ -x "$AMIXER" ] || exit 0
-
-do_start() {
-        # Enable the Headset (Audio Out)
-        $AMIXER sset "Headset" 2 > /dev/null
-        $AMIXER sset "HeadsetL Mixer AudioL1" on > /dev/null
-        $AMIXER sset "HeadsetR Mixer AudioR1" on > /dev/null
-}
-
-case "$1" in
-start)
-        echo "$NAME: setting default mixer settings."
-        do_start
-        ;;
-stop)
-        ;;
-*)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
deleted file mode 100644
index dde693053..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx5/imx-audio
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          imx mixer setup
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Initialize the imx audio mixer
-# Description:       Unmute FRONT and set volume to ~70%.
-### END INIT INFO
-# Based on /etc/init.d/skeleton
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Audio mixer settings"
-NAME=imx-audio
-AMIXER=`which amixer`
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if amixer is not installed
-[ -x "$AMIXER" ] || exit 0
-
-do_start() {
-        # Enable the Headset (Audio Out)
-        $AMIXER sset "Headphone" 120 > /dev/null
-        $AMIXER sset "Speaker Function" on > /dev/null
-        $AMIXER sset "Playback" 140 > /dev/null
-        $AMIXER sset "Capture" 15 > /dev/null
-        $AMIXER sset "Jack Function" on > /dev/null
-}
-
-case "$1" in
-start)
-        echo "$NAME: setting default mixer settings."
-        do_start
-        ;;
-stop)
-        ;;
-*)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
deleted file mode 100644
index dde693053..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio/mx6/imx-audio
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          imx mixer setup
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Initialize the imx audio mixer
-# Description:       Unmute FRONT and set volume to ~70%.
-### END INIT INFO
-# Based on /etc/init.d/skeleton
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Audio mixer settings"
-NAME=imx-audio
-AMIXER=`which amixer`
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if amixer is not installed
-[ -x "$AMIXER" ] || exit 0
-
-do_start() {
-        # Enable the Headset (Audio Out)
-        $AMIXER sset "Headphone" 120 > /dev/null
-        $AMIXER sset "Speaker Function" on > /dev/null
-        $AMIXER sset "Playback" 140 > /dev/null
-        $AMIXER sset "Capture" 15 > /dev/null
-        $AMIXER sset "Jack Function" on > /dev/null
-}
-
-case "$1" in
-start)
-        echo "$NAME: setting default mixer settings."
-        do_start
-        ;;
-stop)
-        ;;
-*)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0
diff --git a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb b/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb
deleted file mode 100644
index 3cdc1afde..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-audio/imx-audio_0.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Provide a basic init script to enable audio"
-DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot."
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-PR = "r4"
-
-inherit update-rc.d
-
-RDEPENDS_${PN} = "alsa-utils-amixer"
-
-SRC_URI = "file://imx-audio"
-
-INITSCRIPT_NAME = "imx-audio"
-INITSCRIPT_PARAMS = "defaults 90"
-
-COMPATIBLE_MACHINE = "(mx5|mx6)"
-INHIBIT_DEFAULT_DEPS = "1"
-
-do_install() {
-        install -d ${D}${sysconfdir} \
-                   ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/imx-audio ${D}${sysconfdir}/init.d
-        cat ${WORKDIR}/${INITSCRIPT_NAME} | \
-            sed -e 's,/etc,${sysconfdir},g' \
-                -e 's,/usr/sbin,${sbindir},g' \
-                -e 's,/var,${localstatedir},g' \
-                -e 's,/usr/bin,${bindir},g' \
-                -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-}
-