diff mbox

[1/1] Bump rpi-firmware version for RPi2

Message ID 54DDCA01.7050709@hebden.net.au
State Changes Requested
Headers show

Commit Message

James Hebden Feb. 13, 2015, 9:55 a.m. UTC
From: James Hebden <james@hebden.net.au>

Signed-off-by: James Hebden <james@hebden.net.au>

This patch bumps the rpi-firmware package to include RPi2 support. It also removes the workaround previously required when installing DTBs for the pi, as they are now in the same branch as the latest firmware.
It also adds the install commands to install the DTB for BCM2709 (RPi2 B)

---
  package/rpi-firmware/rpi-firmware.mk | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Yann E. MORIN Feb. 22, 2015, 6:32 p.m. UTC | #1
James, All,

On 2015-02-13 20:55 +1100, James Hebden spake thusly:
> 
> From: James Hebden <james@hebden.net.au>
> 
> Signed-off-by: James Hebden <james@hebden.net.au>
> 
> This patch bumps the rpi-firmware package to include RPi2 support. It also removes the workaround previously required when installing DTBs for the pi, as they are now in the same branch as the latest firmware.
> It also adds the install commands to install the DTB for BCM2709 (RPi2 B)

The commit log should be wrapped at ~75 chars. Also, it should be above
your Signed-off-by line.

I'll fix and resubmit (with a further bump to latest as of today), so
I've marked yours as "Changes Requested" in our patchwork.

Thank you! :-)

Regards,
Yann E. MORIN.

> ---
>  package/rpi-firmware/rpi-firmware.mk | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
> index 03178d5..a343cbe 100644
> --- a/package/rpi-firmware/rpi-firmware.mk
> +++ b/package/rpi-firmware/rpi-firmware.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
> 
> -RPI_FIRMWARE_VERSION = 393dcc0e76f18f6ac1b67ba45d36058410670034
> +RPI_FIRMWARE_VERSION = 47bd0f0f46bc053d8e21655e3a69c4a73ae19b41
>  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
>  RPI_FIRMWARE_LICENSE = BSD-3c
>  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
> @@ -13,13 +13,10 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES
> 
>  ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y)
>  RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware
> -# The Device Tree blobs are not yet in the master branch of the
> -# raspberrypi firmware project, so we have to use a separate branch
> -# for now.
> -RPI_FIRMWARE_VERSION = 09627457b9e15bf4ea4e6751d3c173a3fb65df07
>  define RPI_FIRMWARE_INSTALL_DTB
>  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb
>  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb
> +	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb
>  	for ovldtb in  $(@D)/boot/overlays/*.dtb; do \
>  		$(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \
>  	done
> -- 
> 2.1.4
> 
> 
> 
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox

Patch

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 03178d5..a343cbe 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@ 
  #
  ################################################################################

-RPI_FIRMWARE_VERSION = 393dcc0e76f18f6ac1b67ba45d36058410670034
+RPI_FIRMWARE_VERSION = 47bd0f0f46bc053d8e21655e3a69c4a73ae19b41
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3c
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
@@ -13,13 +13,10 @@  RPI_FIRMWARE_INSTALL_IMAGES = YES

  ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y)
  RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware
-# The Device Tree blobs are not yet in the master branch of the
-# raspberrypi firmware project, so we have to use a separate branch
-# for now.
-RPI_FIRMWARE_VERSION = 09627457b9e15bf4ea4e6751d3c173a3fb65df07
  define RPI_FIRMWARE_INSTALL_DTB
  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb
  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb
+	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb
  	for ovldtb in  $(@D)/boot/overlays/*.dtb; do \
  		$(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \
  	done