beagleboard: machine conf, xorg, audio mixer
cover beagleboard: machine conf, xorg, audio mixer
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
--- meta-yocto/conf/machine/beagleboard.conf | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
meta-yocto/conf/machine/beagleboard.conf +3 -5
@@ -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"
Signature · 1 line
1.7.1
PATCH 2/3 beagleboard: xserver-kdrive xorg.conf installation
In reply to Darren HartAppend 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.
--- .../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
meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf new file +34 -0
@@ -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
meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend new file +10 -0
@@ -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/ +} + +
Signature · 1 line
1.7.1
PATCH 3/3 beagleboard: add basic audio mixer defaults
In reply to Darren HartWe 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.
--- 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
meta-yocto/conf/machine/beagleboard.conf +3 -0
@@ -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"
meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb new file +30 -0
@@ -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} +} +
meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation
In reply to Darren HartOp 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
Quoted 3 lines
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?
Quoted 3 lines
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?
Quoted 72 lines
Signed-off-by Darren Hart <[email protected]>---
.../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.confcreate mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappendmeta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf new file +34
-0@@ -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" +EndSectionmeta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend new file +10
-0@@ -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/ +} + +Signature · 6 lines
1.7.1 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation
Quoted 8 lines · Koen Kooi
Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
Quoted 3 lines
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?
Quoted 6 lines
Quoted 4 lines
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
Quoted 74 lines
Quoted 73 lines
Signed-off-by Darren Hart <[email protected]>---
.../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.confcreate mode 100644 meta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappendmeta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive/beagleboard/xorg.conf new file +34
-0@@ -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" +EndSectionmeta-yocto/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bbappend new file +10
-0@@ -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/ +} + +Signature · 6 lines
1.7.1 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 2/3] beagleboard: xserver-kdrive xorg.conf installation
Op 18 jun 2011, om 17:02 heeft Darren Hart het volgende geschreven:
Quoted 10 lines · Koen Kooi
Quoted 7 lines
Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
Quoted 3 lines
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.
Quoted 5 lines
Quoted 1 line
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
Quoted 16 lines · Koen Kooi
Op 18 jun 2011, om 17:02 heeft Darren Hart het volgende geschreven:
Quoted 13 lines · Koen Kooi
Quoted 9 lines
Op 18 jun 2011, om 02:35 heeft Darren Hart het volgende geschreven:
Quoted 3 lines
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?
Quoted 7 lines
Quoted 3 lines
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.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel