The package rpms/bcm283x-firmware.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/bcm283x-firmware.git/commit/?id=e.... Change: +%ifarch aarch64 Thanks. Full change: ============ commit e01cac83a7748ae0c75ee1ff6932b4260d069687 Author: Peter Robinson <pbrobinson(a)gmail.com&gt; Date: Fri Aug 31 20:01:26 2018 +0100 Latest firmware update, Change locations of firmware, Migration bits for ARMv7, Prepare for supporting HATs/overlays using config.txt diff --git a/bcm2836-rpi-2-b.dtb b/bcm2836-rpi-2-b.dtb new file mode 100644 index 0000000..06ba65b Binary files /dev/null and b/bcm2836-rpi-2-b.dtb differ diff --git a/bcm2837-rpi-3-b-plus.dtb b/bcm2837-rpi-3-b-plus.dtb new file mode 100644 index 0000000..9fa2dd4 Binary files /dev/null and b/bcm2837-rpi-3-b-plus.dtb differ diff --git a/bcm2837-rpi-3-b.dtb b/bcm2837-rpi-3-b.dtb new file mode 100644 index 0000000..7ed21fb Binary files /dev/null and b/bcm2837-rpi-3-b.dtb differ diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec index ecaa0b3..80e4053 100644 --- a/bcm283x-firmware.spec +++ b/bcm283x-firmware.spec @@ -4,19 +4,28 @@ # git clone https://github.com/raspberrypi/firmware.git # cd firmware/boot # tar cJvf ../bcm283x-firmware-%{gitshort}.tar.xz *bin *dat *elf LICENCE.broadcom COPYING.linux overlays/ -%define gitshort 953a339 +%define gitshort ec3f856 Name: bcm283x-firmware -Version: 20180810 +Version: 20180829 Release: 1.%{gitshort}%{?dist} Summary: Broadcom bcm283x firmware for the Raspberry Pi # see LICENSE.broadcom +# DT Overlays covered under Linux Kernel GPLv2 License: Redistributable, no modification permitted URL: https://github.com/raspberrypi/ +BuildRequires: efi-filesystem +BuildRequires: efi-srpm-macros +Requires: efi-filesystem + Source0: %{name}-%{gitshort}.tar.xz Source1: config.txt Source2: config-64.txt +# Direct from Fedora kernel source +Source3: bcm2836-rpi-2-b.dtb +Source4: bcm2837-rpi-3-b.dtb +Source5: bcm2837-rpi-3-b-plus.dtb ExclusiveArch: %{arm} aarch64 @@ -30,22 +39,47 @@ Raspberry Pi. %build %install -mkdir -p %{buildroot}/%{_datadir}/%{name} -mkdir -p %{buildroot}/%{_datadir}/%{name}/overlays -install -p %{SOURCE1} %{buildroot}/%{_datadir}/%{name} -install -p %{SOURCE2} %{buildroot}/%{_datadir}/%{name} -install -p *bin %{buildroot}/%{_datadir}/%{name} -install -p *dat %{buildroot}/%{_datadir}/%{name} -install -p *elf %{buildroot}/%{_datadir}/%{name} -install -p overlays/README %{buildroot}/%{_datadir}/%{name}/overlays -install -p overlays/*.dtbo %{buildroot}/%{_datadir}/%{name}/overlays +mkdir -p %{buildroot}%{efi_esp_root}/overlays +%ifarch %{arm} +install -p %{SOURCE1} %{buildroot}%{efi_esp_root}/config.txt +%endif +%ifarch aarch64 +install -p %{SOURCE2} %{buildroot}%{efi_esp_root}/config.txt +%endif +install -p *bin %{buildroot}%{efi_esp_root} +install -p *dat %{buildroot}%{efi_esp_root} +install -p *elf %{buildroot}%{efi_esp_root} +install -p %{SOURCE3} %{buildroot}%{efi_esp_root} +install -p %{SOURCE4} %{buildroot}%{efi_esp_root} +install -p %{SOURCE5} %{buildroot}%{efi_esp_root} +install -p overlays/README %{buildroot}%{efi_esp_root}/overlays +install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays + +%pre +if [ -d /boot/fw ]; then + mkdir /boot/efi + echo "`blkid /dev/*1 |grep vfat |head -1 | awk '{print $3}'` /boot/efi vfat umask=0077,shortname=winnt 0 2" >> /etc/fstab + mount /boot/efi + rmdir /boot/fw +fi %files # DT Overlays covered under Linux Kernel GPLv2 %license LICENCE.broadcom COPYING.linux -%{_datadir}/%{name} +%config(noreplace) %{efi_esp_root}/config.txt +%{efi_esp_root}/overlays +%{efi_esp_root}/*bin +%{efi_esp_root}/*dat +%{efi_esp_root}/*elf +%{efi_esp_root}/*.dtb %changelog +* Fri Aug 31 2018 Peter Robinson <pbrobinson(a)fedoraproject.org&gt; 20180829-1.ec3f856 +- Latest firmware update +- Change locations of firmware +- Migration bits for ARMv7 +- Prepare for supporting HATs/overlays using config.txt + * Mon Aug 13 2018 Peter Robinson <pbrobinson(a)fedoraproject.org&gt; 20180810-1.953a339 - Latest upstream firmware diff --git a/sources b/sources index 28bb110..a3e7a40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcm283x-firmware-953a339.tar.xz) = 3abbe063ecf2f45d60d547942ff4a679a07f01662f64384528e8a62b9d010c25d9164fb8811dce78515d95247ffc28b2868b4c1f4fb6938e138f1b4c710b9805 +SHA512 (bcm283x-firmware-ec3f856.tar.xz) = 166106009bcbc7576366ca2332b5340efbdacbbd787cf065141c7835f5a00add361879d9101dc5d78d849f5ea76435c9589922daac8abbca7b89fd94ce8a4298