From dd9aa2a5f7244858858fd578f1d5a317ee1b88dd Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 7 Mar 2012 05:26:38 +0100
Subject: [PATCH] bcm2835-bootloader: update to bcm2835-bootloader-3aba47b

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/bcm2835-bootloader/build | 11 +++--------
 packages/tools/bcm2835-bootloader/meta  |  4 ++--
 scripts/image                           |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/build b/packages/tools/bcm2835-bootloader/build
index f6271e9f67..eadd6e7851 100755
--- a/packages/tools/bcm2835-bootloader/build
+++ b/packages/tools/bcm2835-bootloader/build
@@ -22,13 +22,8 @@
 
 . config/options $1
 
-cd $PKG_BUILD
+cd $PKG_BUILD/mkimage
 
-rm -rf ./vmlinuz
+rm -rf ./kernel.img
 
-python ./imagetool-uncompressed.py \
-       first32k.bin \
-       boot-uncompressed.txt \
-       args-uncompressed.txt \
-       $(kernel_path)/arch/arm/boot/Image \
-       vmlinuz
+python ./imagetool-uncompressed.py $(kernel_path)/arch/arm/boot/Image
diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta
index 4190ce4245..f8487a7d68 100644
--- a/packages/tools/bcm2835-bootloader/meta
+++ b/packages/tools/bcm2835-bootloader/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="1.0"
+PKG_VERSION="3aba47b"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
-PKG_URL="http://sraue.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux Python"
 PKG_PRIORITY="optional"
diff --git a/scripts/image b/scripts/image
index 8604d5ae61..4e927a4b83 100755
--- a/scripts/image
+++ b/scripts/image
@@ -178,7 +178,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
 
   if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
-    cp -PR $BUILD/bcm2835-bootloader-*/vmlinuz $TARGET_IMG/$IMAGE_NAME.kernel
+    cp -PR $BUILD/bcm2835-bootloader-*/mkimage/kernel.img $TARGET_IMG/$IMAGE_NAME.kernel
     chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
   else
     cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel