Version in base suite: 1.20190215-1+deb10u2

Base version: raspi3-firmware_1.20190215-1+deb10u2
Target version: raspi3-firmware_1.20190215-1+deb10u3
Base file: /srv/ftp-master.debian.org/ftp/pool/non-free/r/raspi3-firmware/raspi3-firmware_1.20190215-1+deb10u2.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/non-free/r/raspi3-firmware/raspi3-firmware_1.20190215-1+deb10u3.dsc

 changelog                             |    9 +++++++++
 kernel/postinst.d/z50-raspi3-firmware |   19 ++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff -Nru raspi3-firmware-1.20190215/debian/changelog raspi3-firmware-1.20190215/debian/changelog
--- raspi3-firmware-1.20190215/debian/changelog	2019-11-09 08:09:08.000000000 +0000
+++ raspi3-firmware-1.20190215/debian/changelog	2020-03-12 18:30:45.000000000 +0000
@@ -1,3 +1,12 @@
+raspi3-firmware (1.20190215-1+deb10u3) buster; urgency=medium
+
+  * Fix dtb names mismatch in z50-raspi-firmware and add new option
+    upstream_kernel=1 to the config.txt. These two changes allow for the
+    correct boot on RPi families 1 and 0. Thanks to Valentin Vidic for the
+    fix! (Closes: #939727)
+
+ -- Gunnar Wolf <gwolf@debian.org>  Thu, 12 Mar 2020 12:30:45 -0600
+
 raspi3-firmware (1.20190215-1+deb10u2) buster; urgency=medium
 
   * Fix serial console output sent to bluetooth port with kernel 5.x.
diff -Nru raspi3-firmware-1.20190215/debian/kernel/postinst.d/z50-raspi3-firmware raspi3-firmware-1.20190215/debian/kernel/postinst.d/z50-raspi3-firmware
--- raspi3-firmware-1.20190215/debian/kernel/postinst.d/z50-raspi3-firmware	2019-11-09 08:09:08.000000000 +0000
+++ raspi3-firmware-1.20190215/debian/kernel/postinst.d/z50-raspi3-firmware	2020-03-12 18:30:45.000000000 +0000
@@ -64,21 +64,9 @@
 fi
 
 if [ "$KERNEL" = "auto" ]; then
-  pi0w_dtb=${dtb_path}/bcm2835-rpi-zero-w.dtb
-  pi1ap_dtb=${dtb_path}/bcm2835-rpi-a-plus.dtb
-  pi1bp_dtb=${dtb_path}/bcm2835-rpi-b-plus.dtb
-  pi2b_dtb=${dtb_path}/bcm2836-rpi-2-b.dtb
-  pi3b_dtb=${dtb_path}/bcm2837-rpi-3-b.dtb
-  pi3bp_dtb=${dtb_path}/bcm2837-rpi-3-b-plus.dtb
-  picm3_dtb=${dtb_path}/bcm2837-rpi-cm3-io3.dtb
-
-  [ -e "${pi0w_dtb}"  ] && cp "${pi0w_dtb}"  /boot/firmware/bcm2835-rpi-zero-w.dtb
-  [ -e "${pi1ap_dtb}"  ] && cp "${pi1ap_dtb}" /boot/firmware/bcm2835-rpi-a-plus.dtb
-  [ -e "${pi1bp_dtb}"  ] && cp "${pi1bp_dtb}" /boot/firmware/bcm2835-rpi-b-plus.dtb
-  [ -e "${pi2b_dtb}"  ] && cp "${pi2b_dtb}"  /boot/firmware/bcm2709-rpi-2-b.dtb
-  [ -e "${pi3b_dtb}"  ] && cp "${pi3b_dtb}"  /boot/firmware/bcm2710-rpi-3-b.dtb
-  [ -e "${pi3bp_dtb}" ] && cp "${pi3bp_dtb}" /boot/firmware/bcm2710-rpi-3-b-plus.dtb
-  [ -e "${picm3_dtb}" ] && cp "${picm3_dtb}" /boot/firmware/bcm2710-rpi-cm3.dtb
+  for dtn in ${dtb_path}/bcm*.dtb; do
+    [ -e "${dtb}" ] && cp "${dtb}" /boot/firmware/
+  done
 
   latest_kernel_basename=$(basename "$latest_kernel")
   latest_initrd_basename=$(basename "$latest_initrd")
@@ -111,6 +99,7 @@
 
 cat >>/boot/firmware/config.txt <<EOF
 enable_uart=1
+upstream_kernel=1
 
 kernel=${KERNEL}
 EOF