5 files changed, 9 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7d69484e91..a78469c3d1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -81,7 +81,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	?= "2.12.3"
 PREFERRED_VERSION_glib-2.0              ?= "2.14.4"
-PREFERRED_VERSION_pango                 ?= "1.18.1"
 
 PREFERRED_PROVIDER_avahi = "avahi"
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 912bb72c7d..e326118a1a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -3,6 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20"
 PREFERRED_VERSION_glib-2.0 = "2.16.1"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pango = "1.18.3"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e871e92473..60d35f2bdb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -137,9 +137,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4210"
-SRCREV_pn-opkg-native ?= "4210"
-SRCREV_pn-opkg-sdk ?= "4209"
+SRCREV_pn-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a8e4d6cca8..76c27b153e 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -19,7 +19,7 @@ include conf/machine/include/tune-arm1136jf-s.inc
 IMAGE_FSTYPES ?= "tar.bz2"
 
 # Guesswork
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS2"
 
 # No kernel recipe yet
 PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 7a7b5c1a60..5c7f5bed7f 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
+UBOOT_ENTRYPOINT="0x10c08000"
+
 # PREFERRED_VERSION_u-boot = "1.1.6"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
@@ -26,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-base \
                           kernel-module-vfat \
                           kernel-module-ohci-hcd \
+                          kernel-module-tlv320aic23 \
+                          kernel-module-snd-omap-alsa-aic23 \
                           "
 
 RDEPENDS_kernel-base = ""