From eb389208c10dc6932872a6b841955780b850a50a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 17 May 2012 13:30:28 +0200
Subject: [PATCH] bcm2835-bootloader: update to bcm2835-bootloader-4467284

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/bcm2835-bootloader/build   | 29 -----------------------
 packages/tools/bcm2835-bootloader/meta    |  2 +-
 packages/tools/bcm2835-bootloader/release |  6 ++---
 scripts/image                             |  9 +++----
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100755 packages/tools/bcm2835-bootloader/build

diff --git a/packages/tools/bcm2835-bootloader/build b/packages/tools/bcm2835-bootloader/build
deleted file mode 100755
index eadd6e7851..0000000000
--- a/packages/tools/bcm2835-bootloader/build
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD/mkimage
-
-rm -rf ./kernel.img
-
-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 f8487a7d68..31150b2146 100644
--- a/packages/tools/bcm2835-bootloader/meta
+++ b/packages/tools/bcm2835-bootloader/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="3aba47b"
+PKG_VERSION="4467284"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release
index deffea73af..ae7f142c33 100755
--- a/packages/tools/bcm2835-bootloader/release
+++ b/packages/tools/bcm2835-bootloader/release
@@ -23,6 +23,6 @@
 . config/options $1
 
 mkdir -p $RELEASE_DIR/3rdparty/bootloader
-  cp -PR $BUILD/bcm2835-driver-*/boot/arm128_start.elf $RELEASE_DIR/3rdparty/bootloader/start.elf
-  cp -PR $BUILD/bcm2835-driver-*/boot/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/
-  cp -PR $BUILD/bcm2835-driver-*/boot/loader.bin $RELEASE_DIR/3rdparty/bootloader/
+  cp -PR $PKG_BUILD/arm128_start.elf $RELEASE_DIR/3rdparty/bootloader/start.elf
+  cp -PR $PKG_BUILD/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/
+  cp -PR $PKG_BUILD/loader.bin $RELEASE_DIR/3rdparty/bootloader/
diff --git a/scripts/image b/scripts/image
index 9d64fa3fa1..0addca92f8 100755
--- a/scripts/image
+++ b/scripts/image
@@ -167,6 +167,8 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # copy kernel to target dir
   if [ "$BOOTLOADER" = "u-boot" ]; then
     KERNEL_IMAGE="uImage"
+  elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
+    KERNEL_IMAGE="Image"
   else
     KERNEL_IMAGE="bzImage"
   fi
@@ -177,12 +179,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
     KERNEL_ARCH="arm"
   fi
 
-  if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
-    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
-  fi
+  cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel
 
   if [ "$BOOTLOADER" = "atv-bootloader" ]; then
     cp -PR $BUILD/atv-bootloader-*/mach_kernel $TARGET_IMG/$IMAGE_NAME.mach_kernel