From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 10 Jun 2021 13:04:36 +0000 (+0000)
Subject: rpi-firmware: update to 20210606
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db4000f91ec910de12db5e5dc27cfc5416d0418c;p=people%2Fstevee%2Fipfire-2.x.git

rpi-firmware: update to 20210606

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/aarch64/rpi-firmware b/config/rootfiles/common/aarch64/rpi-firmware
index d8de46b5ae..b48e117b42 100644
--- a/config/rootfiles/common/aarch64/rpi-firmware
+++ b/config/rootfiles/common/aarch64/rpi-firmware
@@ -1,19 +1,23 @@
 #boot/LICENCE.broadcom
+boot/bcm2711-rpi-4-b.dtb
 boot/bootcode.bin
-boot/cmdline.txt
 boot/config.txt
 boot/fixup.dat
+boot/fixup4.dat
+boot/fixup4cd.dat
+boot/fixup4db.dat
+boot/fixup4x.dat
 boot/fixup_cd.dat
 boot/fixup_db.dat
 boot/fixup_x.dat
 boot/start.elf
+boot/start4.elf
+boot/start4cd.elf
+boot/start4db.elf
+boot/start4x.elf
 boot/start_cd.elf
 boot/start_db.elf
 boot/start_x.elf
-lib/firmware/brcm/brcmfmac43430-sdio.RPI3.txt
-lib/firmware/brcm/brcmfmac43430-sdio.txt
+lib/firmware/brcm/brcmfmac43436-sdio.clm_blob
 lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
-lib/firmware/brcm/brcmfmac43455-sdio.txt
-lib/firmware/brcm/brcmfmac43430-sdio.bin
-lib/firmware/brcm/brcmfmac43430a0-sdio.bin
-lib/firmware/brcm/brcmfmac43455-sdio.bin
+lib/firmware/brcm/brcmfmac43456-sdio.clm_blob
diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware
index 62c6b3d33e..b48e117b42 100644
--- a/config/rootfiles/common/armv5tel/rpi-firmware
+++ b/config/rootfiles/common/armv5tel/rpi-firmware
@@ -1,19 +1,23 @@
 #boot/LICENCE.broadcom
+boot/bcm2711-rpi-4-b.dtb
 boot/bootcode.bin
-boot/cmdline.txt
 boot/config.txt
 boot/fixup.dat
+boot/fixup4.dat
+boot/fixup4cd.dat
+boot/fixup4db.dat
+boot/fixup4x.dat
 boot/fixup_cd.dat
 boot/fixup_db.dat
 boot/fixup_x.dat
 boot/start.elf
+boot/start4.elf
+boot/start4cd.elf
+boot/start4db.elf
+boot/start4x.elf
 boot/start_cd.elf
 boot/start_db.elf
 boot/start_x.elf
-lib/firmware/brcm/brcmfmac43430-sdio.bin
-lib/firmware/brcm/brcmfmac43430-sdio.txt
-lib/firmware/brcm/brcmfmac43430-sdio.RPI3.txt
-lib/firmware/brcm/brcmfmac43430a0-sdio.bin
-lib/firmware/brcm/brcmfmac43455-sdio.bin
+lib/firmware/brcm/brcmfmac43436-sdio.clm_blob
 lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
-lib/firmware/brcm/brcmfmac43455-sdio.txt
+lib/firmware/brcm/brcmfmac43456-sdio.clm_blob
diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt
index 37b1b2dac0..cd74ef3309 100644
--- a/config/rpi-firmware/config.txt
+++ b/config/rpi-firmware/config.txt
@@ -52,8 +52,18 @@ gpu_mem=16
 # higher clock than 900Mhz most need over voltage. Use with care.
 #over_voltage=3
 
-################################################################################
-#
-# end
-#
-################################################################################
+##############################################################################
+#
+# u-boot selection for different rpi boards
+#
+##############################################################################
+[pi1]
+kernel=u-boot-rpi1.bin
+[pi2]
+kernel=u-boot-rpi2.bin
+[pi3]
+kernel=u-boot-rpi3.bin
+[pi4]
+kernel=u-boot-rpi4.bin
+[all]
+##############################################################################
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index 7ee3e84202..1379a14814 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20180316
+VER        = 20210606
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e09ff543280f6138d12ea334d550fbd6
+$(DL_FILE)_MD5 = 5e9cccb9df460ea870134578e6caab26
 
 install : $(TARGET)
 
@@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@cd / && tar axf $(DIR_DL)/$(DL_FILE)
-	cp -f /lib/firmware/brcm/brcmfmac43430-sdio.txt \
-	      /lib/firmware/brcm/brcmfmac43430-sdio.RPI3.txt
 	cp -f $(DIR_SRC)/config/rpi-firmware/config.txt /boot
+ifeq "${BUILD_ARCH}" "armv5tel"
+	echo arm_64bit=0 >> /boot/config.txt
+else
+	echo arm_64bit=1 >> /boot/config.txt
+endif
 	@$(POSTBUILD)