Merge pull request #304 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,3 +1,20 @@
+rpi-eeprom (11.9-1) buster; urgency=medium
+
+  [ Nicolas Saenz Julienne ]
+  * rpi-eeprom-update: Surround [:print:] with quotes
+
+  [ Tim Gover ]
+  * Remove SPI_SPEED variable now that flashrom has been removed.
+
+  [ Serge Schneider ]
+  * Revert "Remove binutils dependency"
+
+  [ Tim Gover ]
+  * Revert "rpi-eeprom-update: Surround [:print:] with quotes"
+  * Revert "rpi-eeprom-update: Use 'tr' instead of 'strings'"
+
+ -- Serge Schneider <serge@raspberrypi.com>  Fri, 26 Feb 2021 14:16:55 +0000
+
 rpi-eeprom (11.8-1) buster; urgency=medium
 
   [ Nicolas Saenz Julienne ]

debian/control

@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/raspberrypi/rpi-eeprom.git
 Package: rpi-eeprom
 Architecture: armhf arm64
 Depends: ${shlibs:Depends}, ${misc:Depends}, libraspberrypi-bin, python3,
- raspberrypi-bootloader (>= 1.20190819), pciutils
+ binutils, raspberrypi-bootloader (>= 1.20190819), pciutils
 Breaks: rpi-eeprom-images (<<7.2)
 Replaces: rpi-eeprom-images (<<7.2)
 Recommends: flashrom

rpi-eeprom-update

@@ -44,8 +44,6 @@ EXIT_EEPROM_FROZEN=3
 # EXIT_PREVIOUS_UPDATE_FAILED=4
 
 OVERWRITE_CONFIG=0
-# Maximum safe SPI speed for EEPROM access 16000, slower is ok.
-SPI_SPEED=16000
 # Timestamp for first release which doesn't have a timestamp field
 BOOTLOADER_FIRST_VERSION=1557513636
 EEPROM_SIZE=524288
@@ -113,7 +111,7 @@ getBootloaderConfig() {
    local blconfig_nvmem_path=""
 
    if [ -f "${blconfig_alias}" ]; then
-      local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(tr -cd [:print:] < "${blconfig_alias}")""
+      local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(strings "${blconfig_alias}")""
       local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -samefile "${blconfig_ofnode_path}" 2>/dev/null)
 
       if [ -e "${blconfig_ofnode_link}" ]; then
@@ -288,7 +286,7 @@ getBootloaderUpdateVersion() {
    match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin"
    latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
    if [ -f "${latest}" ]; then
-      BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${latest}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d')
+      BOOTLOADER_UPDATE_VERSION=$(strings "${latest}" | grep BUILD_TIMESTAMP | sed 's/.*=//g')
       BOOTLOADER_UPDATE_IMAGE="${latest}"
    fi
 }