Merge pull request #1 from bluelightning/master

PULL REQUEST: A few minor changes

4 files changed, 10 insertions, 15 deletions

diff --git a/README b/README
index cd1903a..a667848 100644
--- a/README
+++ b/README
@@ -23,10 +23,6 @@ URI: git://git.openembedded.org/meta-openembedded
 branch: master
 revision: HEAD
 
-URI: git://git.angstrom-distribution.org/meta-angstrom
-branch: master
-revision: HEAD
-
 It is preferred that people raise pull requests using GIThub by forking the appropriate tree:
 
                    https://github.com/djwillis/
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.
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
index 8a24051..1ab698b 100755
--- a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
@@ -4,6 +4,8 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for the RaspberryPi board"
 
+PR = "r1"
+
 # Bump MACHINE_KERNEL_PR in the machine config if you update the kernel.
 # This is on the rpi-patches branch
 SRCREV = "0ec4154d64ebba48ca2446cde60a90546311defc"
@@ -20,6 +22,8 @@ S = "${WORKDIR}/git"
 
 KERNEL_DEFCONFIG = "bcmrpi_defconfig"
 
+PARALLEL_MAKEINST = ""
+
 do_configure_prepend() {
         install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
 }