summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-05-15 14:31:20 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-05-15 14:29:14 +0100
commit54324ca7fd33d9c80714d3cd84f40fa6d95a11ac (patch)
tree9c1cf211bcf96edd89b585846e5781f09056347a
parentc8057784c18687ac787bd60eb68993a1b0933e18 (diff)
downloadmeta-raspberrypi-54324ca7fd33d9c80714d3cd84f40fa6d95a11ac.tar.gz
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>
-rwxr-xr-xrecipes-bcm/bootfiles/bcm2835-bootfiles.bb14
-rwxr-xr-xrecipes-bcm/bootfiles/bcm2835-bootfiles/LICENCE3
2 files changed, 6 insertions, 11 deletions
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 @@
1DESCRIPTION = "Closed source binary files to help boot the ARM on the BCM2835." 1DESCRIPTION = "Closed source binary files to help boot the ARM on the BCM2835."
2LICENSE = "proprietary-binary" 2LICENSE = "proprietary-binary"
3 3
4LIC_FILES_CHKSUM = "file://LICENCE;md5=d2defdc6f09addccc73d83b74f2dda58" 4LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"
5 5
6# This is on the master branch 6# This is on the master branch
7SRCREV = "78d00079176a2751be9dd226f8463cbcc9c55073" 7SRCREV = "56cd7ffb3f7244017c8eb3b492ea37592c678506"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 file://LICENCE \
11 git://github.com/raspberrypi/firmware.git;protocol=git;branch=master \ 10 git://github.com/raspberrypi/firmware.git;protocol=git;branch=master \
12" 11"
13 12
14S = "${WORKDIR}" 13S = "${WORKDIR}/git/boot"
15BOOT_FILES = "${S}/git/boot"
16 14
17PR = "r0" 15PR = "r1"
18 16
19addtask deploy before do_package after do_install 17addtask deploy before do_package after do_install
20 18
21do_deploy() { 19do_deploy() {
22 install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles 20 install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
23 for i in ${BOOT_FILES}/*.elf ; do 21 for i in *.elf ; do
24 cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles 22 cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
25 done 23 done
26 for i in ${BOOT_FILES}/*.bin ; do 24 for i in *.bin ; do
27 cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles 25 cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
28 done 26 done
29} 27}
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 @@
1Proprietary binary firmware provided by Broadcom.
2
3It is distributed with the express permission of the RaspberryPi foundation.