From f233664faa41ca5a3df1702f4eada771096af67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 1 Apr 2016 13:37:33 +0200 Subject: [PATCH] brcm2708-gpu-fw: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update also adds individual download of firmware files instead of fetching every file on the repository (10-MiB vs 100+MiB). Also copy Linux license from kernel directory instead of using the rpi-firmware one. Signed-off-by: Álvaro Fernández Rojas --- package/kernel/brcm2708-gpu-fw/Makefile | 71 ++++++++++++++++++++++--- target/linux/brcm2708/image/Makefile | 3 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile index dc70585f18..5f34f3218a 100644 --- a/package/kernel/brcm2708-gpu-fw/Makefile +++ b/package/kernel/brcm2708-gpu-fw/Makefile @@ -1,5 +1,6 @@ # # Copyright (C) 2012-2016 OpenWrt.org +# Copyright (C) 2016 LEDE project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,18 +9,64 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=brcm2708-gpu-fw -PKG_REV:=30fe8178d61c1ff9bc168edaafdbcb101aa6245e -PKG_VERSION:=20160304 +PKG_REV:=046effa13ebc4cc7601df4f06f4834bd0eebb0f8 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_REV).tar.gz -PKG_SOURCE_URL:=https://github.com/Hexxeh/rpi-firmware/archive/ -PKG_MD5SUM:=5707f4d9ffd8d10018c68ecb8b363308 - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_REV) include $(INCLUDE_DIR)/package.mk +RPI_FIRMWARE_URL:=@GITHUB/raspberrypi/firmware/$(PKG_REV)/boot/ +RPI_FIRMWARE_FILE:=rpi-firmware-$(PKG_REV) + +define Download/LICENCE_broadcom + FILE:=$(RPI_FIRMWARE_FILE)-LICENCE.broadcom + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=LICENCE.broadcom + MD5SUM:=4a4d169737c0786fb9482bb6d30401d1 +endef +$(eval $(call Download,LICENCE_broadcom)) + +define Download/bootcode_bin + FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=bootcode.bin + MD5SUM:=84d279839c772d3a040b80187388975b +endef +$(eval $(call Download,bootcode_bin)) + +define Download/fixup_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup.dat + MD5SUM:=70a8da83d2d1bbd27ec783db52ca076d +endef +$(eval $(call Download,fixup_dat)) + +define Download/fixup_cd_dat + FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=fixup_cd.dat + MD5SUM:=3da1bb858629729ef11860871bdc0169 +endef +$(eval $(call Download,fixup_cd_dat)) + +define Download/start_elf + FILE:=$(RPI_FIRMWARE_FILE)-start.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start.elf + MD5SUM:=b9e68841248012ddb2405504d8bd1070 +endef +$(eval $(call Download,start_elf)) + +define Download/start_cd_elf + FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf + URL:=$(RPI_FIRMWARE_URL) + URL_FILE:=start_cd.elf + MD5SUM:=a0646b9e425febdad30d515b0480fd45 +endef +$(eval $(call Download,start_cd_elf)) + define Package/brcm2708-gpu-fw SECTION:=boot CATEGORY:=Boot Loaders @@ -32,6 +79,17 @@ define Package/brcm2708-gpu-fw/description GPU and kernel boot firmware for brcm2708. endef +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-LICENCE.broadcom $(PKG_BUILD_DIR)/LICENCE.broadcom + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-bootcode.bin $(PKG_BUILD_DIR)/bootcode.bin + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup.dat $(PKG_BUILD_DIR)/fixup.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-fixup_cd.dat $(PKG_BUILD_DIR)/fixup_cd.dat + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start.elf $(PKG_BUILD_DIR)/start.elf + cp $(DL_DIR)/$(RPI_FIRMWARE_FILE)-start_cd.elf $(PKG_BUILD_DIR)/start_cd.elf +endef + define Build/Compile true endef @@ -42,7 +100,6 @@ endef define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/bootcode.bin $(KERNEL_BUILD_DIR) - $(CP) $(PKG_BUILD_DIR)/COPYING.linux $(KERNEL_BUILD_DIR) $(CP) $(PKG_BUILD_DIR)/LICENCE.broadcom $(KERNEL_BUILD_DIR) $(CP) $(PKG_BUILD_DIR)/start.elf $(KERNEL_BUILD_DIR) $(CP) $(PKG_BUILD_DIR)/start_cd.elf $(KERNEL_BUILD_DIR) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 8cf83a4563..ad71c5679f 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -1,5 +1,6 @@ # # Copyright (C) 2012-2015 OpenWrt.org +# Copyright (C) 2016 LEDE project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -20,8 +21,8 @@ endef define Build/boot-img rm -f $@.boot mkfs.fat -C $@.boot $(FAT32_BLOCKS) + mcopy -i $@.boot $(LINUX_DIR)/COPYING ::COPYING.linux mcopy -i $@.boot $(KDIR)/bootcode.bin :: - mcopy -i $@.boot $(KDIR)/COPYING.linux :: mcopy -i $@.boot $(KDIR)/LICENCE.broadcom :: mcopy -i $@.boot $(KDIR)/start.elf :: mcopy -i $@.boot $(KDIR)/start_cd.elf ::