From bb0a6658af3e660b9c59392fa4f7b0420e549895 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 5 Feb 2021 16:30:31 +0100 Subject: [PATCH] RaspberryPi: Update firmware 0d458874a89921fbe460e422b239695e1e101e2b (#1211) * RaspberryPi: Update firmware 0d458874a89921fbe460e422b239695e1e101e2b * update-firmware-rpi.sh: Fix to work with new hash files --- buildroot-patches/0002-rpi-firmware-Bump-firmware.patch | 4 ++-- buildroot/package/rpi-firmware/rpi-firmware.hash | 2 +- buildroot/package/rpi-firmware/rpi-firmware.mk | 2 +- scripts/update-firmware-rpi.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch index fc0be09e7..36050b656 100644 --- a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch +++ b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch @@ -19,7 +19,7 @@ index 8730ec959b..49a600903c 100644 @@ -1,3 +1,3 @@ # Locally computed -sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz -+sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz ++sha256 e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243 rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 8b2b2c7154..fe7a099407 100644 @@ -30,7 +30,7 @@ index 8b2b2c7154..fe7a099407 100644 ################################################################################ -RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44 -+RPI_FIRMWARE_VERSION = 2ba11f2a07760588546821aed578010252c9ecb3 ++RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/buildroot/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash index 49a600903..4b930088e 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.hash +++ b/buildroot/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz +sha256 e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243 rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk index fe7a09940..a3f8d8dd2 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 2ba11f2a07760588546821aed578010252c9ecb3 +RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/scripts/update-firmware-rpi.sh b/scripts/update-firmware-rpi.sh index 398e85e8f..6bcef3ea0 100755 --- a/scripts/update-firmware-rpi.sh +++ b/scripts/update-firmware-rpi.sh @@ -21,7 +21,7 @@ rm -rf /tmp/rpi-firmware.tar.gz sed -i "s/+RPI_FIRMWARE_VERSION = [a-f0-9]*/+RPI_FIRMWARE_VERSION = $1/g" "$2" -sed -i "s/+sha256 [a-f0-9]* rpi-firmware-[a-f0-9]*.tar.gz/+sha256 $checksum rpi-firmware-$1.tar.gz/g" "$2" +sed -i "s/+sha256\s*[a-f0-9]*\s*rpi-firmware-[a-f0-9]*.tar.gz/+sha256 $checksum rpi-firmware-$1.tar.gz/g" "$2" patch -d buildroot -p 1 < "$2" git commit -m "RaspberryPi: Update firmware $1" "$2" buildroot/package/rpi-firmware