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

[PATCH 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 xorg.conf
and audio mixer patches are stop-gaps that should be eventually replaced
with more generic implementations. With this, we have fb video support and
sane default audio mixer settings.

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: xserver-kdrive xorg.conf installation
  beagleboard: add basic audio mixer defaults

 meta-yocto/conf/machine/beagleboard.conf           |   11 +++--
 .../beagleboard-audio/beagleboard-audio.bb         |   30 +++++++++++++
 .../beagleboard-audio/beagleboard-audio            |   44 ++++++++++++++++++++
 .../xserver-kdrive/beagleboard/xorg.conf           |   34 +++++++++++++++
 .../xorg-xserver/xserver-kdrive_1.7.99.2.bbappend  |   10 ++++
 5 files changed, 124 insertions(+), 5 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-kdrive/beagleboard/xorg.conf
 create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend

[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: xserver-kdrive xorg.conf installation

[Darren Hart]

Append xserver-kdrive to allow for BSP specific xorg.conf files. This also
appears to drag in a runtime dependency on libhal, so add that to the
bbappend's RDEPENDS_${PN} as well.

Ultimately we probably want an xserver independent xorgconf recipe that
enables installing BSP specific xorg.conf files for all the xservers. This
works for now.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 .../xserver-kdrive/beagleboard/xorg.conf           |   34 ++++++++++++++++++++
 .../xorg-xserver/xserver-kdrive_1.7.99.2.bbappend  |   10 ++++++
 2 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
 create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend

diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
new file mode 100644
index 0000000..0335e6a
--- /dev/null
+++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/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
diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
new file mode 100644
index 0000000..cfa6c4f
--- /dev/null
+++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+RDEPENDS_${PN} += "libhal"
+SRC_URI += "file://xorg.conf"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+}
+
+
-- 
1.7.1

Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation

[Koen Kooi]

Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:

> Append xserver-kdrive to allow for BSP specific xorg.conf files. This also
> appears to drag in a runtime dependency on libhal, so add that to the
> bbappend's RDEPENDS_${PN} as well.

Since when does kdrive use xorg.conf?

> Ultimately we probably want an xserver independent xorgconf recipe that
> enables installing BSP specific xorg.conf files for all the xservers. This
> works for now.

Like xserver-xorg-conf in meta-oe?


> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> ---
> .../xserver-kdrive/beagleboard/xorg.conf           |   34 ++++++++++++++++++++
> .../xorg-xserver/xserver-kdrive_1.7.99.2.bbappend  |   10 ++++++
> 2 files changed, 44 insertions(+), 0 deletions(-)
> create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
> create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
> 
> diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
> new file mode 100644
> index 0000000..0335e6a
> --- /dev/null
> +++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/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
> diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
> new file mode 100644
> index 0000000..cfa6c4f
> --- /dev/null
> +++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
> @@ -0,0 +1,10 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +RDEPENDS_${PN} += "libhal"
> +SRC_URI += "file://xorg.conf"
> +
> +do_install_append() {
> +	install -d ${D}/${sysconfdir}/X11
> +	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
> +}
> +
> +
> -- 
> 1.7.1
> 
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation

[Darren Hart]

On 06/18/2011 01:05 AM, Koen Kooi wrote:
> 
> Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
> 
>> Append xserver-kdrive to allow for BSP specific xorg.conf files. This also
>> appears to drag in a runtime dependency on libhal, so add that to the
>> bbappend's RDEPENDS_${PN} as well.
> 
> Since when does kdrive use xorg.conf?

This is my first use of xserver-kdrive. I was experimenting with
xorg.conf changes to resolve some USB input issues I was having... it
seemed to work. Should it be using something else?

> 
>> Ultimately we probably want an xserver independent xorgconf recipe that
>> enables installing BSP specific xorg.conf files for all the xservers. This
>> works for now.
> 
> Like xserver-xorg-conf in meta-oe?

Yes, just like that. I've opened a bug on this, I'll recommend using
this. Any objection to that becoming part of oe-core? However, if I
shouldn't be using xorg.conf for xserver-kdrive, then this might be
irrelevant.

--
Darren

> 
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> ---
>> .../xserver-kdrive/beagleboard/xorg.conf           |   34 ++++++++++++++++++++
>> .../xorg-xserver/xserver-kdrive_1.7.99.2.bbappend  |   10 ++++++
>> 2 files changed, 44 insertions(+), 0 deletions(-)
>> create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
>> create mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
>>
>> diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf
>> new file mode 100644
>> index 0000000..0335e6a
>> --- /dev/null
>> +++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/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
>> diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
>> new file mode 100644
>> index 0000000..cfa6c4f
>> --- /dev/null
>> +++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend
>> @@ -0,0 +1,10 @@
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> +RDEPENDS_${PN} += "libhal"
>> +SRC_URI += "file://xorg.conf"
>> +
>> +do_install_append() {
>> +	install -d ${D}/${sysconfdir}/X11
>> +	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
>> +}
>> +
>> +
>> -- 
>> 1.7.1
>>
>> _______________________________________________
>> 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 2/3] beagleboard: xserver-kdrive xorg.conf installation

[Koen Kooi]

Op 18 jun 2011, om 17:02 heeft Darren Hart het volgende geschreven:

> 
> 
> On 06/18/2011 01:05 AM, Koen Kooi wrote:
>> 
>> Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
>> 
>>> Append xserver-kdrive to allow for BSP specific xorg.conf files. This also
>>> appears to drag in a runtime dependency on libhal, so add that to the
>>> bbappend's RDEPENDS_${PN} as well.
>> 
>> Since when does kdrive use xorg.conf?
> 
> This is my first use of xserver-kdrive. I was experimenting with
> xorg.conf changes to resolve some USB input issues I was having... it
> seemed to work. Should it be using something else?

AFAIK kdrive doesn't read xorg.conf, one of its design principles :) That's we have all those x*-common scripts that start Xfbdev with a gazillion commandline options.

Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation

[Darren Hart]

On 06/18/2011 08:09 AM, Koen Kooi wrote:
> 
> Op 18 jun 2011, om 17:02 heeft Darren Hart het volgende geschreven:
> 
>> 
>> 
>> On 06/18/2011 01:05 AM, Koen Kooi wrote:
>>> 
>>> Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende
>>> geschreven:
>>> 
>>>> Append xserver-kdrive to allow for BSP specific xorg.conf
>>>> files. This also appears to drag in a runtime dependency on
>>>> libhal, so add that to the bbappend's RDEPENDS_${PN} as well.
>>> 
>>> Since when does kdrive use xorg.conf?
>> 
>> This is my first use of xserver-kdrive. I was experimenting with 
>> xorg.conf changes to resolve some USB input issues I was having...
>> it seemed to work. Should it be using something else?
> 
> AFAIK kdrive doesn't read xorg.conf, one of its design principles :)
> That's we have all those x*-common scripts that start Xfbdev with a
> gazillion commandline options. 

Taking a closer look, I'm wondering if it is the xkeyboard-config
package that is reading xorg.conf. Installing this seems a bit at odds
with what I've been able to dig up about xserver-kdrive. I also noticed
the beagleboard.conf in meta-ti use xserver-xorg, not kdrive.

With that information, I'm building a new image using the XSERVER
preferences from the meta-ti beagleboard conf.

Any objections to moving beagleboard to xserver-xorg instead of kdrive?
I'd like us not to diverge from meta-ti without a very good reason.

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

[PATCH 3/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