Commit 83c9a96b69be21a85a90d7e13b77086f7af87db2
Committed by
GitHub
GitHub
Merge pull request #103 from timg236/pieeprom-2021-11-22
Update default pieeprom.bin to the rpi-eeprom stable release
Showing
6 changed files
with
10 additions
and
6 deletions
recovery/boot.conf
| @@ -3,8 +3,8 @@ BOOT_UART=0 | @@ -3,8 +3,8 @@ BOOT_UART=0 | ||
| 3 | WAKE_ON_GPIO=1 | 3 | WAKE_ON_GPIO=1 |
| 4 | POWER_OFF_ON_HALT=0 | 4 | POWER_OFF_ON_HALT=0 |
| 5 | 5 | ||
| 6 | -# Try SD- > USB PCIe MSD -> USB 2.0 BCM XHCI -> Network -> Loop | ||
| 7 | -BOOT_ORDER=0xf2541 | 6 | +# Try SD first (1), followed by, USB PCIe, NVMe PCIe, USB SoC XHCI then network |
| 7 | +BOOT_ORDER=0xf25641 | ||
| 8 | 8 | ||
| 9 | # Set to 0 to prevent bootloader updates from USB/Network boot | 9 | # Set to 0 to prevent bootloader updates from USB/Network boot |
| 10 | # For remote units EEPROM hardware write protection should be used. | 10 | # For remote units EEPROM hardware write protection should be used. |
recovery/pieeprom-2021-07-06.bin
0 → 100644
No preview for this file type
recovery/pieeprom.bin
No preview for this file type
recovery/pieeprom.original.bin
100644 → 100755
No preview for this file type
recovery/pieeprom.sig
tools/rpi-eeprom-config
| @@ -140,9 +140,13 @@ def apply_update(config, eeprom=None, config_src=None): | @@ -140,9 +140,13 @@ def apply_update(config, eeprom=None, config_src=None): | ||
| 140 | else: | 140 | else: |
| 141 | eeprom_image = get_latest_eeprom() | 141 | eeprom_image = get_latest_eeprom() |
| 142 | create_tempdir() | 142 | create_tempdir() |
| 143 | + | ||
| 144 | + # Replace the contents of bootconf.txt with the contents of the config file | ||
| 143 | tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd') | 145 | tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd') |
| 144 | image = BootloaderImage(eeprom_image, tmp_update) | 146 | image = BootloaderImage(eeprom_image, tmp_update) |
| 145 | - image.write(config) | 147 | + image.update_file(config, BOOTCONF_TXT) |
| 148 | + image.write() | ||
| 149 | + | ||
| 146 | config_str = open(config).read() | 150 | config_str = open(config).read() |
| 147 | if config_src is None: | 151 | if config_src is None: |
| 148 | config_src = '' | 152 | config_src = '' |
| @@ -176,7 +180,7 @@ def edit_config(eeprom=None): | @@ -176,7 +180,7 @@ def edit_config(eeprom=None): | ||
| 176 | if os.path.exists(pending): | 180 | if os.path.exists(pending): |
| 177 | config_src = pending | 181 | config_src = pending |
| 178 | image = BootloaderImage(pending) | 182 | image = BootloaderImage(pending) |
| 179 | - current_config = image.get_config().decode('utf-8') | 183 | + current_config = image.get_file(BOOTCONF_TXT).decode('utf-8') |
| 180 | else: | 184 | else: |
| 181 | current_config, config_src = read_current_config() | 185 | current_config, config_src = read_current_config() |
| 182 | 186 |