Merge pull request #51 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,10 +1,18 @@
-rpi-eeprom (2.2-2) UNRELEASED; urgency=medium
+rpi-eeprom (2.3-1) buster; urgency=medium
+
+  [ Tim Gover ]
+  * license: Move vl805 to firmware to match license document
+  * vl805: Make 13701 available in the critical directory
+
+  [ MilhouseVH ]
+  * use lspci if available instead of vl805. Avoid calling vl805 twice.
 
   [ Serge Schneider ]
   * Add binutils dependency
     - https://github.com/RPi-Distro/repo/issues/156
+  * Install vl850 from firmware/
 
- -- Serge Schneider <serge@raspberrypi.org>  Thu, 07 Nov 2019 14:19:46 +0000
+ -- Serge Schneider <serge@raspberrypi.org>  Mon, 11 Nov 2019 13:24:43 +0000
 
 rpi-eeprom (2.2-1) buster; urgency=medium
 

debian/rpi-eeprom.install

@@ -1,4 +1,4 @@
 rpi-eeprom-config usr/bin/
 rpi-eeprom-update usr/bin/
 debian/default/ etc/
-vl805 usr/bin/
+firmware/vl805 usr/bin/

rpi-eeprom-update

@@ -388,8 +388,13 @@ getVL805CurrentVersion()
    # root then treat the version as unknown and skip VLI updates.
    VL805_CURRENT_VERSION=""
    if [ "$(id -u)" = "0" ]; then
-      if vl805 | grep -q "VL805 FW version"; then
-         VL805_CURRENT_VERSION=$(vl805 | grep "VL805 FW version" | awk '{print $4}')
+      if command -v lspci >/dev/null; then
+         vlver="$(lspci -d 1106:3483 -xxx | awk '/^50:/ { print "VL805 FW version: " $5 $4 $3 $2 }')"
+      else
+         vlver="$(vl805 | grep "VL805 FW version")"
+      fi
+      if [ -n "${vlver}" ]; then
+         VL805_CURRENT_VERSION="${vlver#*: }"
       fi
    fi
 }