diff mbox series

[OpenWrt-Devel] brcm2708: update brcm2708-gpu-fw

Message ID 20180519141419.5434-1-christo.nedev@gmail.com
State Changes Requested
Delegated to: John Crispin
Headers show
Series [OpenWrt-Devel] brcm2708: update brcm2708-gpu-fw | expand

Commit Message

Christo Nedev May 19, 2018, 2:14 p.m. UTC
Why? Because old one does not boot for Pi 3 b and Pi 3 b+. It is very old as well!

Signed-off-by: Christo Nedev <christo.nedev@gmail.com>
---
 package/kernel/brcm2708-gpu-fw/Makefile | 30 +++++-------------------------
 target/linux/brcm2708/image/Makefile    |  2 --
 2 files changed, 5 insertions(+), 27 deletions(-)

Comments

John Crispin May 22, 2018, 4:53 a.m. UTC | #1
On 19/05/18 16:14, Christo Nedev wrote:
> Why? Because old one does not boot for Pi 3 b and Pi 3 b+. It is very old as well!

please write a proper description
     John

>
> Signed-off-by: Christo Nedev <christo.nedev@gmail.com>
> ---
>   package/kernel/brcm2708-gpu-fw/Makefile | 30 +++++-------------------------
>   target/linux/brcm2708/image/Makefile    |  2 --
>   2 files changed, 5 insertions(+), 27 deletions(-)
>
> diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile
> index 9f3d7d3092..61704c7682 100644
> --- a/package/kernel/brcm2708-gpu-fw/Makefile
> +++ b/package/kernel/brcm2708-gpu-fw/Makefile
> @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
>   include $(INCLUDE_DIR)/kernel.mk
>   
>   PKG_NAME:=brcm2708-gpu-fw
> -PKG_VERSION:=2017-08-08
> -PKG_RELEASE:=e7ba7ab135f5a68b2c00a919ea9ac8d5528a5d5b
> +PKG_VERSION:=2018-05-16
> +PKG_RELEASE:=0f5f899ccec1c2ef8bba02aa49700b4ec19b4199
>   
>   PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE)
>   
> @@ -33,7 +33,7 @@ define Download/bootcode_bin
>     FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin
>     URL:=$(RPI_FIRMWARE_URL)
>     URL_FILE:=bootcode.bin
> -  HASH:=b5928ef5253774362014f9e7de856397a932514fe1bc5d7f7817a73c0e10e863
> +  HASH:=c9eb5258766fabf7127e790b257f106e2717f0ccaaed37544b970b0d113956fc
>   endef
>   $(eval $(call Download,bootcode_bin))
>   
> @@ -41,34 +41,18 @@ define Download/fixup_dat
>     FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat
>     URL:=$(RPI_FIRMWARE_URL)
>     URL_FILE:=fixup.dat
> -  HASH:=d95fcac57de7ab71e863a115fd60444f6099cb2ea100f4a68b2c606f79e775ed
> +  HASH:=8a6311e73d0f349be9b8424db0644fd8f48aaf721f3f2f487488c83d7316cbdf
>   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
> -  HASH:=28f3ec8388df4e0c47489f8370a29ca81dbc536fe7db9978342865b5d093ec36
> -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
> -  HASH:=8712fb4e241a22f7a33de0f1d420e0fdfff237952aa685c907b91e59c8d487fa
> +  HASH:=8e77c4cce7e44ced609e5046dd55f19cb7656a8ce4694e733b7eb6ecab915fe1
>   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
> -  HASH:=c600ab34bea389da10aac541bf2f9c62e5f774093b7e1f2f72c4637f9cf3a83c
> -endef
> -$(eval $(call Download,start_cd_elf))
> -
>   define Package/brcm2708-gpu-fw
>     SECTION:=boot
>     CATEGORY:=Boot Loaders
> @@ -87,9 +71,7 @@ define Build/Prepare
>   	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
> @@ -104,9 +86,7 @@ define Build/InstallDev
>   	$(CP) $(PKG_BUILD_DIR)/bootcode.bin $(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)
>   	$(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR)
> -	$(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR)
>   endef
>   
>   $(eval $(call BuildPackage,brcm2708-gpu-fw))
> diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
> index 326ef5a0ee..c2c973648d 100644
> --- a/target/linux/brcm2708/image/Makefile
> +++ b/target/linux/brcm2708/image/Makefile
> @@ -28,9 +28,7 @@ define Build/boot-img
>   	mcopy -i $@.boot $(KDIR)/bootcode.bin ::
>   	mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
>   	mcopy -i $@.boot $(KDIR)/start.elf ::
> -	mcopy -i $@.boot $(KDIR)/start_cd.elf ::
>   	mcopy -i $@.boot $(KDIR)/fixup.dat ::
> -	mcopy -i $@.boot $(KDIR)/fixup_cd.dat ::
>   	mcopy -i $@.boot cmdline.txt ::
>   	mcopy -i $@.boot config.txt ::
>   	mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
diff mbox series

Patch

diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile
index 9f3d7d3092..61704c7682 100644
--- a/package/kernel/brcm2708-gpu-fw/Makefile
+++ b/package/kernel/brcm2708-gpu-fw/Makefile
@@ -9,8 +9,8 @@  include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=brcm2708-gpu-fw
-PKG_VERSION:=2017-08-08
-PKG_RELEASE:=e7ba7ab135f5a68b2c00a919ea9ac8d5528a5d5b
+PKG_VERSION:=2018-05-16
+PKG_RELEASE:=0f5f899ccec1c2ef8bba02aa49700b4ec19b4199
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE)
 
@@ -33,7 +33,7 @@  define Download/bootcode_bin
   FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin
   URL:=$(RPI_FIRMWARE_URL)
   URL_FILE:=bootcode.bin
-  HASH:=b5928ef5253774362014f9e7de856397a932514fe1bc5d7f7817a73c0e10e863
+  HASH:=c9eb5258766fabf7127e790b257f106e2717f0ccaaed37544b970b0d113956fc
 endef
 $(eval $(call Download,bootcode_bin))
 
@@ -41,34 +41,18 @@  define Download/fixup_dat
   FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat
   URL:=$(RPI_FIRMWARE_URL)
   URL_FILE:=fixup.dat
-  HASH:=d95fcac57de7ab71e863a115fd60444f6099cb2ea100f4a68b2c606f79e775ed
+  HASH:=8a6311e73d0f349be9b8424db0644fd8f48aaf721f3f2f487488c83d7316cbdf
 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
-  HASH:=28f3ec8388df4e0c47489f8370a29ca81dbc536fe7db9978342865b5d093ec36
-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
-  HASH:=8712fb4e241a22f7a33de0f1d420e0fdfff237952aa685c907b91e59c8d487fa
+  HASH:=8e77c4cce7e44ced609e5046dd55f19cb7656a8ce4694e733b7eb6ecab915fe1
 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
-  HASH:=c600ab34bea389da10aac541bf2f9c62e5f774093b7e1f2f72c4637f9cf3a83c
-endef
-$(eval $(call Download,start_cd_elf))
-
 define Package/brcm2708-gpu-fw
   SECTION:=boot
   CATEGORY:=Boot Loaders
@@ -87,9 +71,7 @@  define Build/Prepare
 	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
@@ -104,9 +86,7 @@  define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/bootcode.bin $(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)
 	$(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR)
-	$(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR)
 endef
 
 $(eval $(call BuildPackage,brcm2708-gpu-fw))
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 326ef5a0ee..c2c973648d 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -28,9 +28,7 @@  define Build/boot-img
 	mcopy -i $@.boot $(KDIR)/bootcode.bin ::
 	mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
 	mcopy -i $@.boot $(KDIR)/start.elf ::
-	mcopy -i $@.boot $(KDIR)/start_cd.elf ::
 	mcopy -i $@.boot $(KDIR)/fixup.dat ::
-	mcopy -i $@.boot $(KDIR)/fixup_cd.dat ::
 	mcopy -i $@.boot cmdline.txt ::
 	mcopy -i $@.boot config.txt ::
 	mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)