summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-03 02:22:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 15:53:48 (GMT)
commit39a991880a2abe413e58ebcc033b17c52006615d (patch)
tree168945cbc90ec3fdd6b83b272edd2bfbb7450fc2 /meta-yocto
parent9ea681fffb2944671369bcfd9661d503c0daba4f (diff)
downloadpoky-39a991880a2abe413e58ebcc033b17c52006615d.tar.gz
beagleboard-audio: drop in favour of alsa-state
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf3
-rw-r--r--meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb33
-rw-r--r--meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio44
3 files changed, 0 insertions, 80 deletions
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index dd549d0..fa2f8e7 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -12,9 +12,6 @@ XSERVER = "xserver-xorg-lite \
12# Ship all kernel modules by default 12# Ship all kernel modules by default
13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
14 14
15# Setup sane default mixer settings
16MACHINE_EXTRA_RRECOMMENDS += "beagleboard-audio"
17
18# Allow for MMC booting (required by the NAND-less Beagleboard XM) 15# Allow for MMC booting (required by the NAND-less Beagleboard XM)
19EXTRA_IMAGEDEPENDS += "u-boot x-load" 16EXTRA_IMAGEDEPENDS += "u-boot x-load"
20 17
diff --git a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
deleted file mode 100644
index 0bfd7dc..0000000
--- a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1SUMMARY = "Provide a basic init script to enable audio"
2DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot."
3SECTION = "base"
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
6
7PR = "r5"
8
9inherit update-rc.d
10
11RDEPENDS_${PN} = "alsa-utils-amixer"
12
13SRC_URI = "file://beagleboard-audio"
14
15INITSCRIPT_NAME = "beagleboard-audio"
16INITSCRIPT_PARAMS = "defaults 90"
17
18COMPATIBLE_MACHINE = "beagleboard"
19INHIBIT_DEFAULT_DEPS = "1"
20
21do_install() {
22 install -d ${D}${sysconfdir} \
23 ${D}${sysconfdir}/init.d
24 install -m 0755 ${WORKDIR}/beagleboard-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
diff --git a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
deleted file mode 100644
index ed2bd50..0000000
--- a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
+++ /dev/null
@@ -1,44 +0,0 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: beagleboard 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 beagleboard audio mixer
9# Description: Unmute FRONT and set volume to ~70%.
10### END INIT INFO
11
12# Author: Darren Hart <dvhart@linux.intel.com>
13# Based on /etc/init.d/skeleton
14
15PATH=/sbin:/usr/sbin:/bin:/usr/bin
16DESC="Audio mixer settings"
17NAME=beagleboard-audio
18AMIXER=`which amixer`
19SCRIPTNAME=/etc/init.d/$NAME
20
21# Exit if amixer is not installed
22[ -x "$AMIXER" ] || exit 0
23
24do_start() {
25 # Enable the Headset (Audio Out)
26 $AMIXER sset "Headset" 2 > /dev/null
27 $AMIXER sset "HeadsetL Mixer AudioL1" on > /dev/null
28 $AMIXER sset "HeadsetR Mixer AudioR1" 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