summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--conf/distro/unslung.conf3
-rw-r--r--conf/machine/omap5912osk.conf4
4 files changed, 9 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index a26c53173d..e326118a1a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -3,5 +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"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 21c1d3cf14..cb960d5168 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -57,7 +57,7 @@ SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4194-r4165"
+SRCREV_pn-linux-openmoko ?= "4194"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index cd523f8482..b5d28f9024 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -80,3 +80,6 @@ INHERIT += "nslu2-mirrors"
# - mwester 16 Dec 2006
#
PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
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 = ""