merge of 'ab9d95c9d897aff9c41ecadae47e79f56471d306'

     and 'ac4a07d54c50b6a1f43effcd0aa17f68d6735d18'

6 files changed, 36 insertions, 7 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 3afdd8054a..bd5969a068 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -70,6 +70,9 @@ PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 PREFERRED_VERSION_glibc 		= "2.6.1"
 PREFERRED_VERSION_glibc-intermediate 	= "2.6.1"
 PREFERRED_VERSION_glibc-initial 	= "2.6.1"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
+
 
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	= "2.12.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7c42165401..d6cc495ef0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -18,7 +18,8 @@ SRCREV_pn-eglibc ?= "3531"
 SRCREV_pn-eglibc-initial ?= "3531"
 SRCREV_pn-eglibc-intermediate ?= "3531"
 SRCREV_pn-ezxd ?= "2074"
-SRCREV_pn-elf2flt="1786"
+SRCREV_pn-elf2flt ?= "1786"
+SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
@@ -37,7 +38,7 @@ SRCREV_pn-libmokopanelui2 ?= "3226"
 SRCREV_pn-libmokoui2 ?= "3229"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3745"
+SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-openmoko ?= "2937"
 SRCREV_pn-llvm-gcc4 ?= "374"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 3c50ef561b..f4423946bd 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
-require.inc/machine/include/tune-geodelx.inc
+require conf/machine/include/tune-geodelx.inc
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
new file mode 100644
index 0000000000..ecff6fae13
--- /dev/null
+++ b/conf/machine/davinci-sffsdr.conf
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@NAME: DM6446 cpu on a Lyrtech Small Form Factor SDR board
+#@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+HOTPLUG = "udev"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "davinci_sffsdr_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+#ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index 95ba519d3b..3cf0a7fab2 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -21,10 +21,10 @@ require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "128"
 IMAGE_CMD_jffs2 = " \
-/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \
-		     --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-		     --eraseblock=0x20000 --pad --faketime -n; \
-/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+          mkfs.jffs2 --root=${IMAGE_ROOTFS} \
+             --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+             --eraseblock=0x20000 --pad --faketime -n; \
+          sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 		  -e 0x20000 -p; \
 	          cd ${DEPLOY_DIR_IMAGE}; \
diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.inc
index 335fadec6e..335fadec6e 100644
--- a/conf/machine/include/tune-geodelx.conf
+++ b/conf/machine/include/tune-geodelx.inc