From 2de08fa6d4208a016b447832601f83fd51cb8f93 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 14 Nov 2011 10:39:06 +0100
Subject: [PATCH] u-boot: enhance deploy symlinking logic

It will now deploy:

u-boot-<machine>-<version>.suffix
u-boot-<machine>.suffix (symlink)
u-boot.suffix (symlink)

And additionally for SPL builds:

MLO-<machine>-<version>
MLO-<machine> (symlink)
MLO (symlink)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 recipes-bsp/u-boot/u-boot.inc          | 10 +++++++++-
 recipes-bsp/u-boot/u-boot_2011.10rc.bb |  5 +----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc
index 310d80ca..1621d6b1 100644
--- a/recipes-bsp/u-boot/u-boot.inc
+++ b/recipes-bsp/u-boot/u-boot.inc
@@ -63,6 +63,14 @@ do_deploy () {
 	install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
 
 	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${UBOOT_SYMLINK}
+	rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
 	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
+
+	if [ -e ${S}/MLO ] ; then
+		install ${S}/MLO ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE}-${PV}
+		rm -f ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE} ${DEPLOY_DIR_IMAGE}/MLO
+		ln -sf MLO-${MACHINE}-${PV} ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE}
+		ln -sf MLO-${MACHINE}-${PV} ${DEPLOY_DIR_IMAGE}/MLO
+	fi
 }
diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
index 1065e53a..51f71843 100644
--- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
@@ -4,7 +4,7 @@ require u-boot.inc
 COMPATIBLE_MACHINE = "(ti33x)"
 DEFAULT_PREFERENCE_ti33x = "99"
 PV = "2011.09+git"
-PR = "r23"
+PR = "r24"
 
 # SPL build
 UBOOT_BINARY = "u-boot.img"
@@ -28,6 +28,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
 S = "${WORKDIR}/git"
 
-do_deploy_append () {
-    install ${S}/MLO ${DEPLOY_DIR_IMAGE}/MLO
-}