From d1ba49be3052aada2ca8fe8f12787b4fce8a6383 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 11 Mar 2011 15:53:11 -0800 Subject: n450: revamp audio mixer init script Fixes [YOCTO #798] n450-audiofix suffered from various problems, including not getting installed. This patch adds it via MACHINE_EXTRA_RRECOMMENDS and cleans up the various bugs in the implementation. The structure has been renamed and the comments updated for consistency. This should be considered a stop-gap measure, as something along the lines of oe's alsa-state is a far better solution. Signed-off-by: Darren Hart --- meta-n450/conf/machine/n450.conf | 2 ++ meta-n450/recipes-bsp/audiofix/audiofix.bb | 17 ---------------- meta-n450/recipes-bsp/audiofix/files/n450_audiofix | 13 ------------ meta-n450/recipes-bsp/n450-audio/n450-audio.bb | 23 ++++++++++++++++++++++ .../recipes-bsp/n450-audio/n450-audio/n450-audio | 15 ++++++++++++++ 5 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 meta-n450/recipes-bsp/audiofix/audiofix.bb delete mode 100644 meta-n450/recipes-bsp/audiofix/files/n450_audiofix create mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio.bb create mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf index eda91d9d..c06cb6cb 100644 --- a/meta-n450/conf/machine/n450.conf +++ b/meta-n450/conf/machine/n450.conf @@ -11,3 +11,5 @@ APPEND += "console=ttyS0,115200 console=tty0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" +# Ensure the bsp packages are installed +MACHINE_EXTRA_RRECOMMENDS += " n450-audio " diff --git a/meta-n450/recipes-bsp/audiofix/audiofix.bb b/meta-n450/recipes-bsp/audiofix/audiofix.bb deleted file mode 100644 index 3b1d2723..00000000 --- a/meta-n450/recipes-bsp/audiofix/audiofix.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Provide a basic init script to enable audio" -DESCRIPTION = "This package provides an init script which enables the audio on startup via the amixer command. It address a problem with the development board that has the audio muted on power on." -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -PR = "r2" -RDEPENDS = "alsa-utils-amixer" - -SRC_URI = "file://n450_audiofix" - -do_install () { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d - install -m 0755 ${WORKDIR}/n450_audiofix ${D}${sysconfdir}/init.d - ln -sf ${D}${sysconfdir}/init.d/n450_audiofix ${D}/${sysconfdir}/rc5.d/S91n450_audiofix -} diff --git a/meta-n450/recipes-bsp/audiofix/files/n450_audiofix b/meta-n450/recipes-bsp/audiofix/files/n450_audiofix deleted file mode 100644 index 9ec04482..00000000 --- a/meta-n450/recipes-bsp/audiofix/files/n450_audiofix +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -AMIXER=`which amixer` - -if [ ! -e $AMIXER ]; then - if [ -e /usr/bin/amixer ]; then - AMIXER=/usr/bin/amixer - else - echo "No amixer, so unable to reset Front channel ON" - fi -fi - - diff --git a/meta-n450/recipes-bsp/n450-audio/n450-audio.bb b/meta-n450/recipes-bsp/n450-audio/n450-audio.bb new file mode 100644 index 00000000..20e3a9ad --- /dev/null +++ b/meta-n450/recipes-bsp/n450-audio/n450-audio.bb @@ -0,0 +1,23 @@ +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://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r3" + +inherit update-rc.d + +RDEPENDS = "alsa-utils-amixer" + +SRC_URI = "file://n450-audio" + +INITSCRIPT_NAME = "n450-audio" +INITSCRIPT_PARAMS = "defaults 90" + +do_install() { + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/n450-audio ${D}${sysconfdir}/init.d +} + diff --git a/meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio b/meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio new file mode 100644 index 00000000..ad1b0bd4 --- /dev/null +++ b/meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio @@ -0,0 +1,15 @@ +#!/bin/sh + +AMIXER=`which amixer` + +if [ ! -e "$AMIXER" ]; then + if [ -e /usr/bin/amixer ]; then + AMIXER=/usr/bin/amixer + else + echo "amixer not found, unable to set default audio settings." + exit 1 + fi +fi + +# Enable the "Front" simple controls (black phones jack) +$AMIXER sset Front 30 on -- cgit v1.2.3-54-g00ecf