From b4e73a0b0392b0f57b0ec4c130694194104c165c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sep 09 2020 15:40:26 +0000
Subject: Latest firmware update, Adjust firmware packaging


---

diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index dfe08ec..343251b 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -4,10 +4,10 @@
 # git clone https://github.com/raspberrypi/firmware.git
 # cd firmware/boot
 # tar cJvf ../bcm283x-firmware-%{gitshort}.tar.xz *bin *dat *elf bcm2709*dtb bcm271*dtb LICENCE.broadcom COPYING.linux overlays/
-%define gitshort c2c6ce8
+%define gitshort baec4d2
 
 Name:          bcm283x-firmware
-Version:       20200401
+Version:       20200903
 Release:       1.%{gitshort}%{?dist}
 Summary:       Firmware for the Broadcom bcm283x/bcm2711 used in the Raspberry Pi
 # see LICENSE.broadcom
@@ -20,6 +20,9 @@ ExclusiveArch: %{arm} aarch64
 BuildRequires: efi-filesystem
 BuildRequires: efi-srpm-macros
 Requires:      efi-filesystem
+Requires:      bcm283x-overlays
+Requires:      bcm2835-firmware
+Requires:      bcm2711-firmware
 
 Source0:       %{name}-%{gitshort}.tar.xz
 Source1:       config.txt
@@ -29,6 +32,29 @@ Source2:       config-64.txt
 Firmware for the Broadcom bcm283x and bcm2711 series of systems on a chip as
 shipped in the Raspberry Pi series of devices.
 
+%package     -n bcm283x-overlays
+Summary:     HAT Overlays for the Raspberry Pi
+
+%description -n bcm283x-overlays
+Hardware Attached Ontop (HATs) overlays for the Raspberry Pi series of devices.
+
+%package     -n bcm2835-firmware
+Summary:     Firmware for the Raspberry Pi 2, 3, 3+ and CM3
+Requires:    bcm283x-firmware
+Requires:    bcm283x-overlays
+
+%description -n bcm2835-firmware
+Firmware for the Raspberry Pi 2, 3, 3+ and CM3
+
+%package     -n bcm2711-firmware
+Summary:     Firmware for the Raspberry Pi 4 and CM4
+Requires:    bcm283x-firmware
+Requires:    bcm283x-overlays
+
+%description -n bcm2711-firmware
+Firmware for the Raspberry Pi 4 and CM4
+
+
 %prep
 %setup -q -n %{name}-%{gitshort} -c %{name}-%{gitshort}
 
@@ -62,13 +88,29 @@ fi
 # DT Overlays covered under Linux Kernel GPLv2
 %license LICENCE.broadcom COPYING.linux
 %config(noreplace) %{efi_esp_root}/config.txt
+%{efi_esp_root}/bootcode.bin
+
+%files -n bcm283x-overlays
 %{efi_esp_root}/overlays
-%{efi_esp_root}/*bin
-%{efi_esp_root}/*dat
-%{efi_esp_root}/*elf
-%{efi_esp_root}/*.dtb
+
+%files -n bcm2835-firmware
+%{efi_esp_root}/bcm2709-rpi-2-b.dtb
+%{efi_esp_root}/bcm2710-rpi-*
+%{efi_esp_root}/fixup*
+%{efi_esp_root}/start*
+%exclude %{efi_esp_root}/fixup4*
+%exclude %{efi_esp_root}/start4*
+
+%files -n bcm2711-firmware
+%{efi_esp_root}/bcm2711-rpi-*
+%{efi_esp_root}/fixup4*
+%{efi_esp_root}/start4*
 
 %changelog
+* Thu Sep 03 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20200903-1.baec4d2
+- Latest firmware update
+- Adjust firmware packaging
+
 * Mon Apr  6 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20200401-1.c2c6ce8
 - Latest firmware update
 
diff --git a/sources b/sources
index c2673bf..06406c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcm283x-firmware-f382cc1.tar.xz) = dbc7aa6cc2fa8f0f6525fa0f89d711c371f8e4ef9f3f0e50c31879b6aa041fe59259d9bd0ac35fabd76bc427f9cc569eb4f0e3502a1b0c3c2e946249293b400f
+SHA512 (bcm283x-firmware-baec4d2.tar.xz) = 3167232223e6a7d2fd47c09fee4e5491cc8d90b2ee44ac6fdb301a2ce23f182853025bfd4771d00daa6fdba21d476345034c8b9145346e6966049e2b96872b3c