Merge pull request #3333 from raspberrypi/develop

Push to production
raspberrypi · Dec 21, 2023 · db801e8 · db801e8
2 parents 04d84a8 + 72410c2
commit db801e8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/documentation/asciidoc/computers/raspberry-pi-5/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi-5/introduction.adoc
@@ -53,7 +53,7 @@ To force a hard shutdown, press and hold the power button.
 
 If the Raspberry Pi board is shut down, but still powered, pressing the power button will restart the board.
 
-Default shutdown wattage is around 1 to 1.4W. However this can be decreased by manually editing the EEPROM configurationw with `sudo rpi-eeprom-config -e`. Change the settings to the following:
+Default shutdown wattage is around 1 to 1.4W. However this can be decreased by manually editing the EEPROM configuration with `sudo rpi-eeprom-config -e`. Change the settings to the following:
 
 [source]
 ----

diff --git a/documentation/asciidoc/computers/raspberry-pi-5/mipi.adoc b/documentation/asciidoc/computers/raspberry-pi-5/mipi.adoc
@@ -32,7 +32,7 @@ If you are using our xref:../accessories/display.adoc[7-inch Touch Display] with
 dtoverlay=vc4-kms-dsi-7inch
 ----
 
-alternatively, attaching it to the `CAM/DISP 0` connector you can add the following line:
+Alternatively, attaching it to the `CAM/DISP 0` connector you can add the following line:
 
 [source,bash]
 ----

diff --git a/documentation/asciidoc/computers/raspberry-pi-5/pcie.adoc b/documentation/asciidoc/computers/raspberry-pi-5/pcie.adoc
@@ -38,3 +38,25 @@ dtparam=pciex1_gen=3
 ----
 
 WARNING: The Raspberry Pi 5 is not certified for Gen 3.0 speeds, and connections to PCIe devices at these speeds may be unstable. 
+
+You should then reboot your Raspberry Pi for these settings to take effect.
+
+=== Booting from PCIe
+
+Once enabled, and after you reboot, an NVMe disk attached via the PCIe should be visible. However, your Raspberry Pi won't try to boot off the NVMe drive. If you wish to enable boot support you will need to change the `BOOT_ORDER` in the bootloader configuration. Edit the EEPROM configuration by,
+
+[source]
+----
+sudo rpi-eeprom-config --edit
+----
+
+and change the `BOOT_ORDER` line to be as below.
+
+[source]
+----
+BOOT_ORDER=0xf416
+----
+
+after saving your changes, reboot your Raspberry Pi to update the EEPROM.
+
+NOTE: Your Raspberry Pi will not boot from an attached NVMe drive unless you have the external PCIe port enabledd, and there's a NVMe drive with a valid boot partition attached to the PCIe bus.