Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

12 files changed, 298 insertions, 22 deletions

diff --git a/recipes/abiword/abiword_2.8.0.bb b/recipes/abiword/abiword_2.8.1.bb
index 546e29cd64..24e20a4e55 100644
--- a/recipes/abiword/abiword_2.8.0.bb
+++ b/recipes/abiword/abiword_2.8.1.bb
@@ -1,7 +1,5 @@
 require abiword-2.5.inc
 
-PR = "r1"
-
 SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
 
 do_configure() {
diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index 1bd3d6e5da..d143b0ad0c 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -3,12 +3,13 @@ require eglibc.inc
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.10"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 SVN_REV="9124"
 EGLIBC_BRANCH="eglibc-2_10"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://armv4t-interworking.patch;patch=1 \
+           file://IO-acquire-lock-fix.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb
index 6b27745f65..3efcb36d37 100644
--- a/recipes/eglibc/eglibc_2.9.bb
+++ b/recipes/eglibc/eglibc_2.9.bb
@@ -3,12 +3,13 @@ require eglibc.inc
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.9"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 SVN_REV="8690"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
 	   file://armv4t-interworking.patch;patch=1 \
+	   file://IO-acquire-lock-fix.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb
index 1988350e6b..1a91af88d8 100644
--- a/recipes/eglibc/eglibc_svn.bb
+++ b/recipes/eglibc/eglibc_svn.bb
@@ -1,7 +1,7 @@
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-SRCREV = "9123"
+SRCREV = "9170"
 DEFAULT_PREFERENCE = "-1"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.10+svnr${SRCREV}"
@@ -10,6 +10,7 @@ EGLIBC_BRANCH="trunk"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
 	   file://armv4t-interworking.patch;patch=1 \
+	   file://IO-acquire-lock-fix.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/files/IO-acquire-lock-fix.patch b/recipes/eglibc/files/IO-acquire-lock-fix.patch
new file mode 100644
index 0000000000..4d3e0613b1
--- /dev/null
+++ b/recipes/eglibc/files/IO-acquire-lock-fix.patch
@@ -0,0 +1,15 @@
+import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+Index: libc/bits/stdio-lock.h
+===================================================================
+--- libc.orig/bits/stdio-lock.h	2009-10-28 14:34:19.000000000 -0700
++++ libc/bits/stdio-lock.h	2009-10-28 14:34:54.000000000 -0700
+@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
+   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
+   _IO_flockfile (_fp)
+ 
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+   _IO_funlockfile (_fp);						      \
+   _IO_cleanup_region_end (0)
diff --git a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch
index c71f9e6289..12f5435599 100644
--- a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch
+++ b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c
 ===================================================================
---- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c	2009-10-29 16:31:14.000000000 +0100
-+++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c	2009-10-29 17:23:51.000000000 +0100
+--- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c	2009-09-10 00:13:59.000000000 +0200
++++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c	2009-10-30 12:44:52.000000000 +0100
 @@ -13,6 +13,7 @@
   * option) any later version.
   */
@@ -18,7 +18,7 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c
  
  #include "mpc83xx.h"
  
-@@ -79,7 +81,22 @@
+@@ -79,7 +81,21 @@
  
  static int __init declare_of_platform_devices(void)
  {
@@ -29,13 +29,12 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c
 +
  	of_platform_bus_probe(NULL, of_bus_ids, NULL);
 +
-+	/* activate USB, RFID and touch board */
++	/* activate USB and RFID */
 +	np = of_find_compatible_node(NULL, NULL, "fsl,mpc8313-exio");
 +	if (np)
 +	{
 +		gpio_direction_output(217, 1); // EXIO1 : USB
 +		gpio_direction_output(219, 1); // EXIO3 : RFID
-+		gpio_direction_output(220, 1); // EXIO4 : Touch board
 +		of_node_put(np);
 +	}
  	return 0;
diff --git a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch
index d82f8b1e54..ae5428ddd0 100644
--- a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch
+++ b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.31/drivers/input/misc/Kconfig
 ===================================================================
---- linux-2.6.31.orig/drivers/input/misc/Kconfig	2009-10-19 16:32:13.000000000 +0200
-+++ linux-2.6.31/drivers/input/misc/Kconfig	2009-10-19 16:49:22.000000000 +0200
+--- linux-2.6.31.orig/drivers/input/misc/Kconfig	2009-10-30 12:50:24.000000000 +0100
++++ linux-2.6.31/drivers/input/misc/Kconfig	2009-10-30 13:20:50.000000000 +0100
 @@ -269,4 +269,14 @@
  
  	  To compile this driver as a module, choose M here: the
@@ -19,8 +19,8 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig
  endif
 Index: linux-2.6.31/drivers/input/misc/Makefile
 ===================================================================
---- linux-2.6.31.orig/drivers/input/misc/Makefile	2009-10-19 16:32:13.000000000 +0200
-+++ linux-2.6.31/drivers/input/misc/Makefile	2009-10-19 16:49:22.000000000 +0200
+--- linux-2.6.31.orig/drivers/input/misc/Makefile	2009-10-30 12:50:24.000000000 +0100
++++ linux-2.6.31/drivers/input/misc/Makefile	2009-10-30 13:20:50.000000000 +0100
 @@ -26,3 +26,4 @@
  obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
  obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
@@ -29,8 +29,8 @@ Index: linux-2.6.31/drivers/input/misc/Makefile
 Index: linux-2.6.31/drivers/input/misc/capsense-btns.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.31/drivers/input/misc/capsense-btns.c	2009-10-19 16:49:22.000000000 +0200
-@@ -0,0 +1,440 @@
++++ linux-2.6.31/drivers/input/misc/capsense-btns.c	2009-10-30 13:21:11.000000000 +0100
+@@ -0,0 +1,443 @@
 +/*
 + * CAPSENSE Interface driver
 + *
@@ -185,9 +185,12 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c
 +	changed = capsense->key_state ^ new_state;
 +	for (i = 0; i < ARRAY_SIZE(input_keymap); i++)
 +		if (changed & (1 << i))
++		{
++			input_event(dev->input, EV_MSC, MSC_SCAN, i);
 +			input_report_key(dev->input, input_keymap[i], (new_state & (1 << i)));
++			input_sync(dev->input);
++		}
 +	capsense->key_state = new_state;
-+	input_sync(dev->input);
 +}
 +
 +
@@ -474,7 +477,7 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c
 Index: linux-2.6.31/drivers/input/misc/capsense-procfs.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.31/drivers/input/misc/capsense-procfs.c	2009-10-19 16:50:35.000000000 +0200
++++ linux-2.6.31/drivers/input/misc/capsense-procfs.c	2009-10-30 13:20:03.000000000 +0100
 @@ -0,0 +1,380 @@
 +/*
 + * CAPSENSE Interface driver
diff --git a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch
new file mode 100644
index 0000000000..6b2dba1337
--- /dev/null
+++ b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch
@@ -0,0 +1,244 @@
+Index: linux-2.6.31/drivers/input/misc/Kconfig
+===================================================================
+--- linux-2.6.31.orig/drivers/input/misc/Kconfig	2009-10-30 14:22:53.000000000 +0100
++++ linux-2.6.31/drivers/input/misc/Kconfig	2009-10-30 14:22:53.000000000 +0100
+@@ -270,6 +270,13 @@
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called dm355evm_keys.
+ 
++config INPUT_BOC_BTNS
++	tristate "BoC buttons interface"
++	select INPUT_POLLDEV
++	help
++	  To compile this driver as a module, choose M here:
++	  the module will be called boc-btns.
++
+ config INPUT_CAPSENSE_BTNS
+ 	tristate "CAPSENSE CY8C201xx buttons interface"
+ 	select INPUT_POLLDEV
+Index: linux-2.6.31/drivers/input/misc/Makefile
+===================================================================
+--- linux-2.6.31.orig/drivers/input/misc/Makefile	2009-10-30 14:22:53.000000000 +0100
++++ linux-2.6.31/drivers/input/misc/Makefile	2009-10-30 14:22:53.000000000 +0100
+@@ -26,4 +26,5 @@
+ obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
+ obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
+ obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
++obj-$(CONFIG_INPUT_BOC_BTNS)		+= boc-btns.o
+ obj-$(CONFIG_INPUT_CAPSENSE_BTNS)	+= capsense-btns.o
+Index: linux-2.6.31/drivers/input/misc/boc-btns.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.31/drivers/input/misc/boc-btns.c	2009-10-30 14:24:42.000000000 +0100
+@@ -0,0 +1,211 @@
++/*
++ * Buttons for BoC
++ *
++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu).
++ *
++ * Jeremy Lainé <jeremy.laine@bolloretelecom.eu>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <linux/init.h>
++#include <linux/gpio.h>
++#include <linux/input-polldev.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++
++#define BUTTONS_POLL_INTERVAL	30	/* msec */
++
++struct input_button {
++	unsigned char gpio;
++	unsigned char active_low;
++};
++
++static struct input_button input_buttons[] = {
++	{ 220, 1 }, // WPS button (active low)
++	{ 231, 0 }, // reset button
++};
++
++static unsigned short input_keymap[] = {
++	KEY_F2,
++	KEY_F3,
++};
++
++struct buttons_dev {
++	struct input_polled_dev *poll_dev;
++	int state[ARRAY_SIZE(input_keymap)];
++};
++
++/*
++ * Buttons events handling
++ */
++
++static void handle_buttons(struct input_polled_dev *dev)
++{
++	int i, value;
++	struct buttons_dev *bdev = dev->private;
++	struct input_dev *input = dev->input;
++
++	// read GPIO
++	for (i = 0; i < ARRAY_SIZE(input_keymap); i++)
++	{
++		value = gpio_get_value(input_buttons[i].gpio) ? 1 : 0;
++		if (input_buttons[i].active_low)
++			value = !value;
++		if (value != bdev->state[i])
++		{
++			input_event(input, EV_MSC, MSC_SCAN, i);
++			input_report_key(input, input_keymap[i], value);
++			input_sync(input);
++			bdev->state[i] = value;
++		}
++	}
++}
++
++/*
++ * Device initialisation
++ */
++
++static int __devinit boc_buttons_probe(struct platform_device *pdev)
++{
++	struct buttons_dev *bdev;
++	struct input_polled_dev *poll_dev;
++	struct input_dev *input;
++	int error, i;
++
++	for (i = 0; i < ARRAY_SIZE(input_keymap); i++)
++	{
++		if (gpio_request(input_buttons[i].gpio, NULL) < 0)
++			return -ENODEV;
++	}
++
++	bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
++	if (!bdev)
++		return -ENOMEM;
++
++	poll_dev = input_allocate_polled_device();
++	if (!poll_dev) {
++		error = -ENOMEM;
++		goto out_allocated;
++	}
++
++	poll_dev->private = bdev;
++	poll_dev->poll = handle_buttons;
++	poll_dev->poll_interval = BUTTONS_POLL_INTERVAL;
++
++	input = poll_dev->input;
++	input->name = "BoC buttons";
++	input->phys = "boc/input0";
++	input->id.bustype = BUS_HOST;
++	input->dev.parent = &pdev->dev;
++
++	input->keycode = input_keymap;
++	input->keycodemax = ARRAY_SIZE(input_keymap);
++	input->keycodesize = sizeof(unsigned short);
++
++	input_set_capability(input, EV_MSC, MSC_SCAN);
++	set_bit(EV_KEY, input->evbit);
++	for (i = 0; i < ARRAY_SIZE(input_keymap); i++)
++	{
++		set_bit(input_keymap[i], input->keybit);
++		bdev->state[i] = 0;
++	}
++
++	bdev->poll_dev = poll_dev;
++	dev_set_drvdata(&pdev->dev, bdev);
++
++	error = input_register_polled_device(poll_dev);
++	if (error < 0)
++		goto out_polled;
++
++	return 0;
++
++out_polled:
++	input_free_polled_device(poll_dev);
++out_allocated:
++	kfree(bdev);
++	return error;
++}
++
++static int __devexit boc_buttons_remove(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct buttons_dev *bdev = dev_get_drvdata(dev);
++	int i;
++
++	input_unregister_polled_device(bdev->poll_dev);
++	input_free_polled_device(bdev->poll_dev);
++	kfree(bdev);
++	dev_set_drvdata(dev, NULL);
++
++	for (i = 0; i < ARRAY_SIZE(input_keymap); i++)
++		gpio_free(input_buttons[i].gpio);
++
++	return 0;
++}
++
++/*
++ * Driver initialisation
++ */
++
++static struct platform_driver boc_buttons_driver = {
++	.probe	= boc_buttons_probe,
++	.remove	= __devexit_p(boc_buttons_remove),
++	.driver	= {
++		.name	= "boc-btns",
++		.owner	= THIS_MODULE,
++	},
++};
++
++static struct platform_device *boc_buttons_device;
++
++static int __init boc_buttons_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&boc_buttons_driver);
++	if (err)
++		return err;
++
++	boc_buttons_device = platform_device_alloc("boc-btns", -1);
++	if (!boc_buttons_device) {
++		err = -ENOMEM;
++		goto err_unregister_driver;
++	}
++
++	err = platform_device_add(boc_buttons_device);
++	if (err)
++		goto err_free_device;
++
++	return 0;
++
++err_free_device:
++	platform_device_put(boc_buttons_device);
++err_unregister_driver:
++	platform_driver_unregister(&boc_buttons_driver);
++	return err;
++}
++
++static void __exit boc_buttons_exit(void)
++{
++	platform_device_unregister(boc_buttons_device);
++	platform_driver_unregister(&boc_buttons_driver);
++}
++
++MODULE_AUTHOR("Jeremy Laine <jeremy.laine@m4x.org>");
++MODULE_DESCRIPTION("BoC input driver");
++MODULE_LICENSE("GPL");
++module_init(boc_buttons_init);
++module_exit(boc_buttons_exit);
diff --git a/recipes/linux/linux-2.6.31/boc01/defconfig b/recipes/linux/linux-2.6.31/boc01/defconfig
index ad7856ce85..ae2b9b510e 100644
--- a/recipes/linux/linux-2.6.31/boc01/defconfig
+++ b/recipes/linux/linux-2.6.31/boc01/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.31.3
-# Wed Oct 28 11:48:05 2009
+# Fri Oct 30 14:31:19 2009
 #
 # CONFIG_PPC64 is not set
 
@@ -1061,7 +1061,7 @@ CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=y
+# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -1089,6 +1089,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_INPUT_BOC_BTNS=y
 CONFIG_INPUT_CAPSENSE_BTNS=y
 
 #
diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb
index 0956afdf75..d908326016 100644
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@ -30,6 +30,7 @@ SRC_URI_append_boc01 = "\
            file://011-091028-gpio.patch;patch=1 \
            file://012-091019-capsense.patch;patch=1 \
            file://013-091015-lcd.patch;patch=1 \
+           file://014-091030-buttons.patch;patch=1 \
            "
 
 SRC_URI_append_collie = "\
diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc
index 8ab0282743..6fdbaac87f 100644
--- a/recipes/u-boot/u-boot.inc
+++ b/recipes/u-boot/u-boot.inc
@@ -13,6 +13,7 @@ PARALLEL_MAKE=""
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
 UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_BINARY ?= "u-boot.bin"
 UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
 UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
 
@@ -39,7 +40,7 @@ do_install () {
 
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+	install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
 
 	cd ${DEPLOY_DIR_IMAGE}
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 15c3060a39..59c0598f97 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r32"
+PR ="r33"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -143,6 +143,9 @@ SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \
                        file://uboot-eabi-fix-HACK2.patch;patch=1 \
                        file://corgi-standard-partitioning.patch;patch=1 \
                        "
+SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing"
+SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0"
+
 S = "${WORKDIR}/git"
 
 
@@ -158,6 +161,14 @@ do_configure_prepend_c7x0() {
         sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/corgi.h
 }
 
+do_compile_append_sheevaplug() {
+	oe_runmake u-boot.kwb
+}
+
+UBOOT_IMAGE_sheevaplug = "u-boot-${MACHINE}-${PV}-${PR}.kwb"
+UBOOT_BINARY_sheevaplug = "u-boot.kwb"
+UBOOT_SYMLINK_sheevaplug ?= "u-boot-${MACHINE}.kwb"
+
 do_deploy_prepend_mini2440() {
 	cp ${S}/u-boot-nand16k.bin ${S}/u-boot.bin
 }