Skip to content

Commit

Permalink
Merge pull request #4014 from raspberrypi/develop
Browse files Browse the repository at this point in the history
Roll out latest changes to production
  • Loading branch information
nathan-contino authored Jan 23, 2025
2 parents a29024e + 17a6d5f commit 9e45c6c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GEM
asciidoctor (>= 2.0.0, < 3.0.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand Down Expand Up @@ -62,7 +62,7 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
nokogiri (1.18.1)
nokogiri (1.18.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
Expand All @@ -89,7 +89,7 @@ GEM
tilt (2.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2024.2)
tzinfo-data (1.2025.1)
tzinfo (>= 1.0.0)
unicode-display_width (2.6.0)
wdm (0.2.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ The firmware uses the special https://www.kernel.org/doc/html/latest/devicetree/

Each property is stored as a 32-bit integer unless indicated otherwise.

`boot-mode`:: The boot-mode used to load the kernel. See xref:raspberry-pi.adoc#BOOT_ORDER[BOOT_ORDER].
`boot-mode`:: The boot-mode used to load the kernel. See the xref:raspberry-pi.adoc#BOOT_ORDER[BOOT_ORDER] documentation for a list of possible boot-mode values.

`partition`:: The partition number used during boot. If a `boot.img` ramdisk is loaded then this refers to partition that the ramdisk was loaded from rather than the partition number within the ramdisk.

Expand Down
24 changes: 24 additions & 0 deletions documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,30 @@ NOTE: This list is not exhaustive - there may be codes in use that are not in th
| 8GB
| Sony UK

| b04171
| 5
| 1.1
| 2GB
| Sony UK

| c04171
| 5
| 1.1
| 4GB
| Sony UK

| d04171
| 5
| 1.1
| 8GB
| Sony UK

| e04171
| 5
| 1.1
| 16GB
| Sony UK

| b04180
| CM5
| 1.0
Expand Down

0 comments on commit 9e45c6c

Please sign in to comment.