From 3f3c7eef6846dfe4520ee0c3a238439ca87f4c21 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 13 2019 15:36:51 +0000
Subject: Upstream dts for 5.0, Add Raspberry Pi 2 dtb


---

diff --git a/bcm2836-rpi-2-b.dtb b/bcm2836-rpi-2-b.dtb
new file mode 100644
index 0000000..28512de
Binary files /dev/null and b/bcm2836-rpi-2-b.dtb differ
diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index 1442c7e..21de785 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -8,7 +8,7 @@
 
 Name:          bcm283x-firmware
 Version:       20190212
-Release:       2.%{gitshort}%{?dist}
+Release:       3.%{gitshort}%{?dist}
 Summary:       Broadcom bcm283x firmware for the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -28,10 +28,12 @@ Source0:       %{name}-%{gitshort}.tar.xz
 Source1:       config.txt
 Source2:       config-64.txt
 
-Source5:       bcm2837-rpi-3-a-plus.dtb
-Source6:       bcm2837-rpi-3-b.dtb
-Source7:       bcm2837-rpi-3-b-plus.dtb
-Source8:       bcm2837-rpi-cm3-io3.dtb
+# From Linux kernel
+Source5:       bcm2836-rpi-2-b.dtb
+Source6:       bcm2837-rpi-3-a-plus.dtb
+Source7:       bcm2837-rpi-3-b.dtb
+Source8:       bcm2837-rpi-3-b-plus.dtb
+Source9:       bcm2837-rpi-cm3-io3.dtb
 
 %description
 Firmware for the Broadcom bcm283x SoC as shipped in devices such as the
@@ -53,13 +55,14 @@ install -p %{SOURCE2} %{buildroot}%{efi_esp_root}/config.txt
 install -p *bin %{buildroot}%{efi_esp_root}
 install -p *dat %{buildroot}%{efi_esp_root}
 install -p *elf %{buildroot}%{efi_esp_root}
-%if 0%{?fedora} > 29
+%if 0%{?fedora} > 30
 install -p *dtb %{buildroot}%{efi_esp_root}
 %else
 install -p %{SOURCE5} %{buildroot}%{efi_esp_root}
 install -p %{SOURCE6} %{buildroot}%{efi_esp_root}
 install -p %{SOURCE7} %{buildroot}%{efi_esp_root}
 install -p %{SOURCE8} %{buildroot}%{efi_esp_root}
+install -p %{SOURCE9} %{buildroot}%{efi_esp_root}
 %endif
 install -p overlays/README %{buildroot}%{efi_esp_root}/overlays
 install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
@@ -83,6 +86,10 @@ fi
 %{efi_esp_root}/*.dtb
 
 %changelog
+* Wed Mar 13 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190212-3.83977fe
+- Upstream dts for 5.0
+- Add Raspberry Pi 2 dtb
+
 * Thu Mar  7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190212-2.83977fe
 - Use upstream kernel DTBs for F-29
 - Minor config updates