raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-20 21:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into debian/buster

Browse Source
This commit is contained in:
Serge Schneider
2019-10-31 12:50:16 +00:00
parent 645b09e730 3916889699
commit 46f07e84d1
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpi-eeprom-config
View File

@@ -77,6 +77,9 @@ class BootloaderImage(object):
if self._out is not None: if self._out is not None:
self._out.write(self._bytes) self._out.write(self._bytes)
self._out.close() self._out.close()
else:
if hasattr(sys.stdout, 'buffer'):
sys.stdout.buffer.write(self._bytes)
else: else:
sys.stdout.write(self._bytes) sys.stdout.write(self._bytes)
@@ -87,6 +90,9 @@ class BootloaderImage(object):
if self._out is not None: if self._out is not None:
self._out.write(config_bytes) self._out.write(config_bytes)
self._out.close() self._out.close()
else:
if hasattr(sys.stdout, 'buffer'):
sys.stdout.buffer.write(config_bytes)
else: else:
sys.stdout.write(config_bytes) sys.stdout.write(config_bytes)

2
rpi-eeprom-update
View File

@@ -282,7 +282,7 @@ rpi-eeprom-update [options]... [FILE]
image(s) (pieeprom.upd and vl805.bin) to the boot partition on the sd-card. image(s) (pieeprom.upd and vl805.bin) to the boot partition on the sd-card.
The SHA256 hash of the corresponding images are written to pieeprom.sig The SHA256 hash of the corresponding images are written to pieeprom.sig
and/or vl805.sig. This guards against file system corruption which could and/or vl805.sig. This guards against file system corruption which could
cause the EEPROM to be flashed with an invalid image. This is is not a cause the EEPROM to be flashed with an invalid image. This is not a
security check. security check.
At the next reboot the ROM runs recovery.bin which updates EEPROM(s). At the next reboot the ROM runs recovery.bin which updates EEPROM(s).

9
test/test-rpi-eeprom-config
View File

@@ -141,20 +141,17 @@ check_conf_size_too_large()
fi fi
} }
check_loopback "../firmware/critical/pieeprom-2019-05-10.bin" "bootconf-2019-05-10.txt"
cleanup
check_loopback "../firmware/critical/pieeprom-2019-07-15.bin" "bootconf-2019-07-15.txt" check_loopback "../firmware/critical/pieeprom-2019-07-15.bin" "bootconf-2019-07-15.txt"
cleanup cleanup
check_update "../firmware/critical/pieeprom-2019-07-15.bin" "pieeprom-2019-07-15-freeze.bin" "bootconf-2019-07-15-freeze.txt" check_update "../firmware/critical/pieeprom-2019-07-15.bin" "pieeprom-2019-07-15-freeze.bin" "bootconf-2019-07-15-freeze.txt"
cleanup cleanup
check_reduce_size "../firmware/critical/pieeprom-2019-05-10.bin" "bootconf-2019-05-10.txt" check_reduce_size "../firmware/critical/pieeprom-2019-07-15.bin" "bootconf-2019-07-15.txt"
cleanup cleanup
check_conf_size_large "../firmware/critical/pieeprom-2019-05-10.bin" check_conf_size_large "../firmware/critical/pieeprom-2019-07-15.bin"
cleanup cleanup
check_conf_size_too_large "../firmware/critical/pieeprom-2019-05-10.bin" check_conf_size_too_large "../firmware/critical/pieeprom-2019-07-15.bin"
cleanup cleanup