7 files changed, 43 insertions, 6 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 382d562426..8517c5bc8e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,9 +1,11 @@
 PREFERRED_VERSION_busybox 	= "1.9.2"
+PREFERRED_VERSION_cairo		= "1.6.4"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 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_pixman	= "0.10.0"
 PREFERRED_VERSION_pulseaudio 	= "0.9.9"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 394ec7c2d4..07873fe700 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -14,6 +14,8 @@ PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc          = "
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
+#TARGET_OS = "linux-gnuspe"
+
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 835bfadabe..8b36e47c90 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080518"
+EFL_SRCDATE ?= "20080524"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d2558449bc..8b91857a78 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -152,11 +152,11 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4247"
-SRCREV_pn-opkg-native ?= "4247"
-SRCREV_pn-opkg-sdk ?= "4247"
+SRCREV_pn-opkg ?= "4452"
+SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-sdk ?= "4452"
 SRCREV_pn-oprofileui ?= "160"
-SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
+SRCREV_pn-packagekit ?= "ebbbfa191257861bd19bd47ba646dce590b51858"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 824ab2b7b3..6842897dd1 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -18,7 +18,7 @@ include conf/machine/include/tune-arm1136jf-s.inc
 #include conf/machine/include/tune-cortexa8.inc
 
 
-IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 jffs2"
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index f88379aa2a..09a71535c6 100644
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -9,6 +9,11 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
 
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
 PREFERRED_VERSION_u-boot = "git"
 #UBOOT_MACHINE = "davinci_dvevm_config"
 
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
new file mode 100644
index 0000000000..b327d8f8b6
--- /dev/null
+++ b/conf/machine/neuros-osd2.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+