Merge pull request #103 from timg236/pieeprom-2021-11-22

Update default pieeprom.bin to the rpi-eeprom stable release

Merge pull request #103 from timg236/pieeprom-2021-11-22
Update default pieeprom.bin to the rpi-eeprom stable release
Tim Gover · GitHub
2 parents 8b390fef a7ed8d18
Showing 6 changed files with 10 additions and 6 deletions
recovery/boot.conf
recovery/pieeprom-2021-07-06.bin
recovery/pieeprom.bin
recovery/pieeprom.original.bin
recovery/pieeprom.sig
tools/rpi-eeprom-config
@@ -3,8 +3,8 @@ BOOT_UART=0
 WAKE_ON_GPIO=1
 POWER_OFF_ON_HALT=0
  
-# Try  SD- > USB PCIe MSD -> USB 2.0 BCM XHCI -> Network ->  Loop
-BOOT_ORDER=0xf2541
+# Try SD first (1), followed by, USB PCIe, NVMe PCIe, USB SoC XHCI then network
+BOOT_ORDER=0xf25641
  
 # Set to 0 to prevent bootloader updates from USB/Network boot
 # For remote units EEPROM hardware write protection should be used.
-68086076eca7de8f9d9041e43525f19e21e78dcf5db3a30210068cc21e184e19
-ts: 1626189116
+b6ad7f2f65320eec7fb851c4ec8eebd085010acd3c83dbbb7cea332f5076cfd7
+ts: 1638293518
@@ -140,9 +140,13 @@ def apply_update(config, eeprom=None, config_src=None):
     else:
         eeprom_image = get_latest_eeprom()
     create_tempdir()
+
+    # Replace the contents of bootconf.txt with the contents of the config file
     tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd')
     image = BootloaderImage(eeprom_image, tmp_update)
-    image.write(config)
+    image.update_file(config, BOOTCONF_TXT)
+    image.write()
+
     config_str = open(config).read()
     if config_src is None:
         config_src = ''
@@ -176,7 +180,7 @@ def edit_config(eeprom=None):
     if os.path.exists(pending):
         config_src = pending
         image = BootloaderImage(pending)
-        current_config = image.get_config().decode('utf-8')
+        current_config = image.get_file(BOOTCONF_TXT).decode('utf-8')
     else:
         current_config, config_src = read_current_config()