diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
| commit | 7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch) | |
| tree | d93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /package/rpi-firmware | |
| parent | 1021766976319b40e64ca8dee12d21c758197801 (diff) | |
| parent | e6803b9f91357773154daed13d6e83712d49476c (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/rpi-firmware')
| -rw-r--r-- | package/rpi-firmware/rpi-firmware.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 945f890be..cbcf79009 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -11,20 +11,16 @@ RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom RPI_FIRMWARE_INSTALL_TARGET = NO 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 = 6c0acfbbdba9908a4a4d21eab63c49ab72cb528b + 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 endef -endif define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin |