3 files changed, 26 insertions, 1 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index de0f6a2a0f..cdd4c6f993 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -166,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4297"
+SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf
new file mode 100644
index 0000000000..16d0705a24
--- /dev/null
+++ b/conf/machine/at91-l9260.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Olimex eval board for the AT91SAM9260
+#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.25"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index 89e14ce363..75937627cd 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -29,3 +29,4 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 require conf/machine/include/tune-arm926ejs.inc
 require conf/machine/include/neuros.inc
 
+MACHINE_EXTRA_RRECOMMENDS = " dsplink-cmemk-module dsplink-module"