Merge pull request #85 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,3 +1,12 @@
+rpi-eeprom (3.1-1) buster; urgency=medium
+
+  [ Tim Gover ]
+  * Update release notes for rpi-eeprom-config change
+  * 2019-01-17: Fix SD card voltage detect + DHCP option 0 padding
+  * rpi-eeprom-config: Fix padding calculation
+
+ -- Serge Schneider <serge@raspberrypi.org>  Tue, 14 Jan 2020 16:12:38 +0000
+
 rpi-eeprom (3.0-1) buster; urgency=medium
 
   [ Tim Gover ]

firmware/release-notes.md

@@ -1,5 +1,12 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2020-01-17 - Git 9e30fb4d (BETA) RC4
+    * Handle DHCP option 0 - padding
+    * Fix SD card voltage detection
+
+## 2020-01-14 - rpi-eeprom-config
+    * Fix padding calculation
+
 ## 2020-01-09 - Git df0ff18c (BETA) RC3
     * Fix parsing of multiple menu entries in PXE options.
     * Fix regression in IP address parsing

rpi-eeprom-config

@@ -48,8 +48,8 @@ class BootloaderImage(object):
                 if name.decode('utf-8') == 'bootconf.txt':
                     return (offset, length)
 
-            offset += 4 + length
+            offset += 8 + length # length + type
-            offset += 8 - (offset % 8) # Pad
+            offset = (offset + 7) & ~7
 
         raise Exception('Bootloader config not found')