Skip to content

Commit d3e45e6

Browse files
Merge pull request #294 from raspberrypi/develop
Publish recent small changes
2 parents b091611 + 01d01d3 commit d3e45e6

File tree

4 files changed

+126
-107
lines changed

4 files changed

+126
-107
lines changed

documentation/asciidoc/computers/getting-started/setting-up.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,14 @@ Raspberry Pi models have the following display connectivity:
117117
|Raspberry Pi 2 Model B
118118
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
119119

120-
|Raspberry Pi 1 (all models)
120+
|Raspberry Pi 1 Model A+ and Model B+
121121
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
122122

123+
|Raspberry Pi 1 Model A and Model B
124+
|HDMI, audio out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack, composite out via https://en.wikipedia.org/wiki/RCA_connector[phono] jack
125+
123126
|Raspberry Pi Zero (all models)
124-
|mini HDMI
127+
|mini HDMI, composite out via solder-pads
125128
|===
126129

127130
NOTE: No Raspberry Pi models support video over USB-C (DisplayPort alt mode).

documentation/asciidoc/computers/raspberry-pi/boot-eeprom.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ For more information, see xref:raspberry-pi.adoc#eeprom-boot-flow[EEPROM bootflo
284284
| Bootloader EEPROM image - same as `pieeprom.upd` but changes `recovery.bin` behaviour to not rename itself to `RECOVERY.000`.
285285

286286
| `pieeprom.sig`
287-
| The sha256 checksum of bootloader image (pieeprom.upd/pieeprom.bin)
287+
| The sha256 checksum (and optional timestamp) of bootloader image (`pieeprom.upd`/`pieeprom.bin`)
288288

289289
| `vl805.bin`
290290
| The VLI805 USB firmware EEPROM image - Raspberry Pi 4B revision 1.3 and earlier only.
@@ -295,7 +295,7 @@ For more information, see xref:raspberry-pi.adoc#eeprom-boot-flow[EEPROM bootflo
295295

296296
* If the bootloader update image is called `pieeprom.upd` then `recovery.bin` is renamed to `recovery.000` once the update has completed, then the system is rebooted. Since `recovery.bin` is no longer present the ROM loads the newly updated bootloader from SPI flash and the OS is booted as normal.
297297
* If the bootloader update image is called `pieeprom.bin` then `recovery.bin` will stop after the update has completed. On success the HDMI output will be green and the green activity LED is flashed rapidly. If the update fails, the HDMI output will be red and an xref:configuration.adoc#led-warning-flash-codes[error code] will be displayed via the activity LED.
298-
* The `.sig` files contain the hexadecimal sha256 checksum of the corresponding image file; additional fields may be added in the future.
298+
* The `.sig` files contain the hexadecimal sha256 checksum of the corresponding image file on the first line, optionally followed by the timestamp of the image (`ts: unixtime`) on the next line; additional fields may be added in the future.
299299
* The ROM found on BCM2711 and BCM2712 does not support loading `recovery.bin` from USB mass storage or TFTP. Instead, newer versions of the bootloader support a self-update mechanism where the bootloader is able to reflash the SPI flash itself. See `ENABLE_SELF_UPDATE` on the xref:raspberry-pi.adoc#raspberry-pi-bootloader-configuration[bootloader configuration] page.
300300
* The temporary EEPROM update files are automatically deleted by the `rpi-eeprom-update` service at startup.
301301

0 commit comments

Comments
 (0)