From 54324ca7fd33d9c80714d3cd84f40fa6d95a11ac Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 15 May 2012 14:31:20 +0100
Subject: [PATCH] bcm2835-bootfiles: update to latest firmware

* Update to the latest git revision
* Use the license file recently added upstream rather than a local one
* Tidy up a few things in the recipe

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 recipes-bcm/bootfiles/bcm2835-bootfiles.bb      | 14 ++++++--------
 recipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE |  3 ---
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100755 recipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE

diff --git a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
index 41c103a..c0e204d 100755
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
@@ -1,29 +1,27 @@
 DESCRIPTION = "Closed source binary files to help boot the ARM on the BCM2835."
 LICENSE = "proprietary-binary"
 
-LIC_FILES_CHKSUM = "file://LICENCE;md5=d2defdc6f09addccc73d83b74f2dda58"
+LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"
 
 # This is on the master branch
-SRCREV = "78d00079176a2751be9dd226f8463cbcc9c55073"         
+SRCREV = "56cd7ffb3f7244017c8eb3b492ea37592c678506"
 
 SRC_URI = " \
-        file://LICENCE \
         git://github.com/raspberrypi/firmware.git;protocol=git;branch=master  \    
 "
 
-S = "${WORKDIR}"
-BOOT_FILES = "${S}/git/boot"
+S = "${WORKDIR}/git/boot"
 
-PR = "r0"
+PR = "r1"
 
 addtask deploy before do_package after do_install
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-	for i in ${BOOT_FILES}/*.elf ; do
+	for i in *.elf ; do
 		cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
 	done
-	for i in ${BOOT_FILES}/*.bin ; do
+	for i in *.bin ; do
 		cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
 	done	
 }
diff --git a/recipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE b/recipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE
deleted file mode 100755
index e7f7f9f..0000000
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE
+++ /dev/null
@@ -1,3 +0,0 @@
-Proprietary binary firmware provided by Broadcom.
-
-It is distributed with the express permission of the RaspberryPi foundation.