[PATCH v2 0/3] beagleboard: machine conf, xorg, audio mixer

[PATCH v2 0/3] beagleboard: machine conf, xorg, audio mixer

[Darren Hart]

Refresh the meta-yocto components of the beagleboard BSP in support of the
recently sent linux-yocto updates for the kernel. The audio mixer patch is a
stop-gap that should be eventually replaced with a more generic implementation,
such as alsa-state - but it ensures the beagleboard boots with sane mixer
defaults. Also, switch to the xf86-lite xserver from kdrive. This keeps the
Yocto Project BSP more inline with the meta-texasinstruments BSP, and eliminates
some trouble with keyboard handling present with the kdrive server.


The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b:

  systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:14:06 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dvhart/beagle
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle

Darren Hart (3):
  beagleboard: cleanup machine config commentary
  beagleboard: add basic audio mixer defaults
  beagleboard: switch to xserver-xf86-lite

 meta-yocto/conf/machine/beagleboard.conf           |   21 ++++++----
 .../beagleboard-audio/beagleboard-audio.bb         |   30 +++++++++++++
 .../beagleboard-audio/beagleboard-audio            |   44 ++++++++++++++++++++
 .../xserver-xf86-config/beagleboard/xorg.conf      |   34 +++++++++++++++
 4 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
 create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
 create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf

[PATCH 1/3] beagleboard: cleanup machine config commentary

[Darren Hart]

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-yocto/conf/machine/beagleboard.conf |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index d6eee6f..2670691 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -6,19 +6,19 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
-#Ship all kernel modules till the board support has matured enough
+# Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 # Allow for MMC booting (required by the NAND-less Beagleboard XM)
 EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
-#include conf/machine/include/tune-arm1136jf-s.inc
 include conf/machine/include/tune-cortexa8.inc
 
 IMAGE_FSTYPES += "tar.bz2 jffs2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
 
-# Guesswork
+# 2.6.37 and later kernels use OMAP_SERIAL, ttyO2
+# earlier kernels use ttyS2
 SERIAL_CONSOLE = "115200 ttyO2"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
@@ -30,6 +30,4 @@ UBOOT_MACHINE = "omap3_beagle_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-
-# and sdio
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
-- 
1.7.1

[PATCH 2/3] beagleboard: add basic audio mixer defaults

[Darren Hart]

We need a generic alsa based mechanism that we can use a bbappend to save
default mixer controls per bsp. Until that is ready, this ensures the Audio Out
on the Beagleboard is enabled out of the box.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-yocto/conf/machine/beagleboard.conf           |    3 +
 .../beagleboard-audio/beagleboard-audio.bb         |   30 +++++++++++++
 .../beagleboard-audio/beagleboard-audio            |   44 ++++++++++++++++++++
 3 files changed, 77 insertions(+), 0 deletions(-)
 create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
 create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio

diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 2670691..945744b 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -9,6 +9,9 @@ XSERVER = "xserver-kdrive-fbdev"
 # Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
+# Setup sane default mixer settings
+MACHINE_EXTRA_RRECOMMENDS += "beagleboard-audio"
+
 # Allow for MMC booting (required by the NAND-less Beagleboard XM)
 EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
diff --git a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
new file mode 100644
index 0000000..b0c2cd7
--- /dev/null
+++ b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
@@ -0,0 +1,30 @@
+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 = "alsa-utils-amixer"
+
+SRC_URI = "file://beagleboard-audio"
+
+INITSCRIPT_NAME = "beagleboard-audio"
+INITSCRIPT_PARAMS = "defaults 90"
+
+do_install() {
+	install -d ${D}${sysconfdir} \
+	           ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/beagleboard-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}
+}
+
diff --git a/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
new file mode 100644
index 0000000..ed2bd50
--- /dev/null
+++ b/meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
@@ -0,0 +1,44 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          beagleboard mixer setup
+# Required-Start:    $syslog
+# Required-Stop:     $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Initialize the beagleboard audio mixer
+# Description:       Unmute FRONT and set volume to ~70%.
+### END INIT INFO
+
+# Author: Darren Hart <dvhart@linux.intel.com>
+# Based on /etc/init.d/skeleton
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Audio mixer settings"
+NAME=beagleboard-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
-- 
1.7.1

[PATCH 3/3] beagleboard: switch to xserver-xf86-lite

[Darren Hart]

Try to get closer to the meta-texasinstruments layer which uses
xserver-xorg. Provide a default xorg.conf that matches the one
from meta-texasinstruments.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-yocto/conf/machine/beagleboard.conf           |    8 +++-
 .../xserver-xf86-config/beagleboard/xorg.conf      |   34 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf

diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 945744b..fddacf9 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -3,8 +3,12 @@
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
+XSERVER = "xserver-xf86-lite \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
 
 # Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
new file mode 100644
index 0000000..0335e6a
--- /dev/null
+++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
@@ -0,0 +1,34 @@
+Section "Module"
+	Load	"extmod"
+	Load	"dbe"
+	Load	"glx"
+	Load	"freetype"
+	Load	"type1"
+	Load	"record"
+	Load	"dri"
+EndSection
+
+Section "Monitor"
+	Identifier	"Builtin Default Monitor"
+EndSection
+
+Section "Device"
+	Identifier	"Builtin Default fbdev Device 0"
+	Driver		"omapfb"
+EndSection
+
+Section "Screen"
+	Identifier	"Builtin Default fbdev Screen 0"
+	Device		"Builtin Default fbdev Device 0"
+	Monitor		"Builtin Default Monitor"
+EndSection
+
+Section "ServerLayout"
+	Identifier	"Builtin Default Layout"
+	Screen		"Builtin Default fbdev Screen 0"
+EndSection
+
+Section "ServerFlags"
+	Option		"DontZap"  "0"
+        Option		"AutoAddDevices" "False"
+EndSection
-- 
1.7.1

Re: [PATCH 2/3] beagleboard: add basic audio mixer defaults

[Koen Kooi]

Op 21 jun 2011, om 09:19 heeft Darren Hart het volgende geschreven:

> We need a generic alsa based mechanism that we can use a bbappend to save
> default mixer controls per bsp. Until that is ready,

Like the alsa-state we had in .dev for some years now? https://github.com/openembedded/openembedded/blob/master/recipes/alsa/alsa-state.bb

Re: [PATCH 2/3] beagleboard: add basic audio mixer defaults

[Koen Kooi]

Op 21 jun 2011, om 09:48 heeft Koen Kooi het volgende geschreven:

> 
> Op 21 jun 2011, om 09:19 heeft Darren Hart het volgende geschreven:
> 
>> We need a generic alsa based mechanism that we can use a bbappend to save
>> default mixer controls per bsp. Until that is ready,
> 
> Like the alsa-state we had in .dev for some years now? https://github.com/openembedded/openembedded/blob/master/recipes/alsa/alsa-state.bb

I really should start reading the coverletter first :)

Re: [PATCH 2/3] beagleboard: add basic audio mixer defaults

[Darren Hart]

On 06/21/2011 12:48 AM, Koen Kooi wrote:
> 
> Op 21 jun 2011, om 09:19 heeft Darren Hart het volgende geschreven:
> 
>> We need a generic alsa based mechanism that we can use a bbappend
>> to save default mixer controls per bsp. Until that is ready,
> 
> Like the alsa-state we had in .dev for some years now?
> https://github.com/openembedded/openembedded/blob/master/recipes/alsa/alsa-state.bb

Yes, I mentioned alsa-state in the cover letter. A follow-on that
affects all of oe-core will take care of this.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 2/3] beagleboard: add basic audio mixer defaults

[Darren Hart]

On 06/21/2011 12:53 AM, Koen Kooi wrote:
> 
> Op 21 jun 2011, om 09:48 heeft Koen Kooi het volgende geschreven:
> 
>>
>> Op 21 jun 2011, om 09:19 heeft Darren Hart het volgende geschreven:
>>
>>> We need a generic alsa based mechanism that we can use a bbappend to save
>>> default mixer controls per bsp. Until that is ready,
>>
>> Like the alsa-state we had in .dev for some years now? https://github.com/openembedded/openembedded/blob/master/recipes/alsa/alsa-state.bb
> 
> I really should start reading the coverletter first :)

And I should read the entire thread first it seems ;)

> 
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH v2 0/3] beagleboard: machine conf, xorg, audio mixer

[Bruce Ashfield]

On 06/21/11 03:19, Darren Hart wrote:
> Refresh the meta-yocto components of the beagleboard BSP in support of the
> recently sent linux-yocto updates for the kernel. The audio mixer patch is a
> stop-gap that should be eventually replaced with a more generic implementation,
> such as alsa-state - but it ensures the beagleboard boots with sane mixer
> defaults. Also, switch to the xf86-lite xserver from kdrive. This keeps the
> Yocto Project BSP more inline with the meta-texasinstruments BSP, and eliminates
> some trouble with keyboard handling present with the kdrive server.

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

I'll get the kernel parts in tomorrow.

Bruce

>
>
> The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b:
>
>    systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:14:06 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib dvhart/beagle
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle
>
> Darren Hart (3):
>    beagleboard: cleanup machine config commentary
>    beagleboard: add basic audio mixer defaults
>    beagleboard: switch to xserver-xf86-lite
>
>   meta-yocto/conf/machine/beagleboard.conf           |   21 ++++++----
>   .../beagleboard-audio/beagleboard-audio.bb         |   30 +++++++++++++
>   .../beagleboard-audio/beagleboard-audio            |   44 ++++++++++++++++++++
>   .../xserver-xf86-config/beagleboard/xorg.conf      |   34 +++++++++++++++
>   4 files changed, 121 insertions(+), 8 deletions(-)
>   create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
>   create mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
>   create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf
>

Re: [PATCH v2 0/3] beagleboard: machine conf, xorg, audio mixer

[Richard Purdie]

On Tue, 2011-06-21 at 00:19 -0700, Darren Hart wrote:
> Refresh the meta-yocto components of the beagleboard BSP in support of the
> recently sent linux-yocto updates for the kernel. The audio mixer patch is a
> stop-gap that should be eventually replaced with a more generic implementation,
> such as alsa-state - but it ensures the beagleboard boots with sane mixer
> defaults. Also, switch to the xf86-lite xserver from kdrive. This keeps the
> Yocto Project BSP more inline with the meta-texasinstruments BSP, and eliminates
> some trouble with keyboard handling present with the kdrive server.
> 
> 
> The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b:
> 
>   systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:14:06 +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib dvhart/beagle
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle
> 
> Darren Hart (3):
>   beagleboard: cleanup machine config commentary
>   beagleboard: add basic audio mixer defaults
>   beagleboard: switch to xserver-xf86-lite

I merged these but I did add a commit of my own following up on
beagleboard-audio to make it machine specific (using COMPATIBLE_MACHINE)
and also INHIBIT_DEFAULT_DEPS which just means it can build before the
toolchain is built.

Cheers,

Richard

Re: [PATCH v2 0/3] beagleboard: machine conf, xorg, audio mixer

[Darren Hart]

On 06/22/2011 09:06 AM, Richard Purdie wrote:
> On Tue, 2011-06-21 at 00:19 -0700, Darren Hart wrote:
>> Refresh the meta-yocto components of the beagleboard BSP in support of the
>> recently sent linux-yocto updates for the kernel. The audio mixer patch is a
>> stop-gap that should be eventually replaced with a more generic implementation,
>> such as alsa-state - but it ensures the beagleboard boots with sane mixer
>> defaults. Also, switch to the xf86-lite xserver from kdrive. This keeps the
>> Yocto Project BSP more inline with the meta-texasinstruments BSP, and eliminates
>> some trouble with keyboard handling present with the kdrive server.
>>
>>
>> The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b:
>>
>>   systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:14:06 +0100)
>>
>> are available in the git repository at:
>>   git://git.pokylinux.org/poky-contrib dvhart/beagle
>>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle
>>
>> Darren Hart (3):
>>   beagleboard: cleanup machine config commentary
>>   beagleboard: add basic audio mixer defaults
>>   beagleboard: switch to xserver-xf86-lite
> 
> I merged these but I did add a commit of my own following up on
> beagleboard-audio to make it machine specific (using COMPATIBLE_MACHINE)
> and also INHIBIT_DEFAULT_DEPS which just means it can build before the
> toolchain is built.

Ack - thanks RP, noted for future reference. Note that beagleboard-audio
has a limited lifespan, hopefully to be replaced soonish by alsa-state
and per-BSP config files.


-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel