Merge pull request #3725 from raspberrypi/develop

Merge latest changes to production!
raspberrypi · Jun 14, 2024 · 14512e4 · 14512e4
2 parents 196d2ab + c045773
commit 14512e4
Show file tree

Hide file tree

Showing 32 changed files with 392 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           version: 1.10.2
       - name: Install arm-none-eabi-gcc GNU Arm Embedded Toolchain
-        uses: carlosperate/arm-none-eabi-gcc-action@v1.8.1
+        uses: carlosperate/arm-none-eabi-gcc-action@v1.8.2
       - name: Install Doxygen
         run: |
           wget https://www.doxygen.nl/files/doxygen-1.10.0.linux.bin.tar.gz

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -57,7 +57,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.16.4)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)

diff --git a/documentation/asciidoc/computers/compute-module/introduction.adoc b/documentation/asciidoc/computers/compute-module/introduction.adoc
@@ -19,7 +19,7 @@ image::images/cm4.jpg[alt="Compute Module 4", width="60%"]
 
 The Compute Module 4 (CM4) contains the internals of a Raspberry Pi 4 (the BCM2711 processor and 1GB, 2GB, 4GB, or 8GB of RAM) as well as an optional 0GB (Lite), 8GB, 16GB or 32GB of eMMC flash storage.
 
-Unlike CM1, CM3, and CM3+, CM4 does not use the DDR2 SODIMM form factor. Instead, CM4 uses two 100-pin high density connectors in a smaller physical footprint.
+Unlike CM1, CM3, and CM3+, CM4 does not use the DDR2 SO-DIMM form factor. Instead, CM4 uses two 100-pin high density connectors in a smaller physical footprint.
 This change helped add the following interfaces:
 
 * an additional second HDMI port
@@ -33,7 +33,7 @@ The previous form factor could not have supported these interfaces.
 .Compute Module 4S
 image::images/cm4s.jpg[alt="Compute Module 4S", width="60%"]
 
-The Compute Module 4S (CM4S) contains the internals of a Raspberry Pi 4 (the BCM2711 processor and 1GB, 2GB, 4GB, or 8GB of RAM) as well as an optional 0GB (Lite), 8GB, 16GB or 32GB of eMMC flash storage. Unlike CM4, CM4S comes in same the DDR2 SODIMM form factor as CM1, CM3, and CM3+.
+The Compute Module 4S (CM4S) contains the internals of a Raspberry Pi 4 (the BCM2711 processor and 1GB, 2GB, 4GB, or 8GB of RAM) as well as an optional 0GB (Lite), 8GB, 16GB or 32GB of eMMC flash storage. Unlike CM4, CM4S comes in same the DDR2 SO-DIMM form factor as CM1, CM3, and CM3+.
 
 [[compute-module-3-plus]]
 === Compute Module 3+

diff --git a/documentation/asciidoc/computers/linux_kernel/patching.adoc b/documentation/asciidoc/computers/linux_kernel/patching.adoc
@@ -17,12 +17,13 @@ Always check your version of the kernel before applying patches. In a kernel sou
 
 [source,console]
 ----
-$ head Makefile -n 3
+$ head Makefile -n 4
 ----
 
 You should see output similar to the following:
 
 ----
+# SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
 SUBLEVEL = 38

diff --git a/documentation/asciidoc/computers/processors.adoc b/documentation/asciidoc/computers/processors.adoc
@@ -10,4 +10,4 @@ include::processors/bcm2711.adoc[]
 
 include::processors/bcm2712.adoc[]
 
-include::processors/rp3a0.adoc[]
+include::processors/rp3a0.adoc[]
diff --git a/documentation/asciidoc/computers/raspberry-pi.adoc b/documentation/asciidoc/computers/raspberry-pi.adoc
@@ -1,3 +1,5 @@
+include::raspberry-pi/introduction.adoc[]
+
 include::raspberry-pi/raspberry-pi-schematics.adoc[]
 
 include::raspberry-pi/raspberry-pi-compliance.adoc[]

diff --git a/documentation/asciidoc/computers/raspberry-pi/images/2-model-b.jpg b/documentation/asciidoc/computers/raspberry-pi/images/2-model-b.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/3-model-a-plus.jpg b/documentation/asciidoc/computers/raspberry-pi/images/3-model-a-plus.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/3-model-b-plus.jpg b/documentation/asciidoc/computers/raspberry-pi/images/3-model-b-plus.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/3-model-b.jpg b/documentation/asciidoc/computers/raspberry-pi/images/3-model-b.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/4-model-b.jpg b/documentation/asciidoc/computers/raspberry-pi/images/4-model-b.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/400.jpg b/documentation/asciidoc/computers/raspberry-pi/images/400.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/5.jpg b/documentation/asciidoc/computers/raspberry-pi/images/5.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/compute-module-1.jpg b/documentation/asciidoc/computers/raspberry-pi/images/compute-module-1.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/compute-module-3-plus.jpg b/documentation/asciidoc/computers/raspberry-pi/images/compute-module-3-plus.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/compute-module-3.jpg b/documentation/asciidoc/computers/raspberry-pi/images/compute-module-3.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/compute-module-4.jpg b/documentation/asciidoc/computers/raspberry-pi/images/compute-module-4.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/compute-module-4s.jpg b/documentation/asciidoc/computers/raspberry-pi/images/compute-module-4s.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/model-a-plus.jpg b/documentation/asciidoc/computers/raspberry-pi/images/model-a-plus.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/model-a.jpg b/documentation/asciidoc/computers/raspberry-pi/images/model-a.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/model-b-plus.jpg b/documentation/asciidoc/computers/raspberry-pi/images/model-b-plus.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/model-b.jpg b/documentation/asciidoc/computers/raspberry-pi/images/model-b.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/pico-h.png b/documentation/asciidoc/computers/raspberry-pi/images/pico-h.png
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/pico-w.png b/documentation/asciidoc/computers/raspberry-pi/images/pico-w.png
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/pico-wh.png b/documentation/asciidoc/computers/raspberry-pi/images/pico-wh.png
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/pico.png b/documentation/asciidoc/computers/raspberry-pi/images/pico.png
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/zero-2-w.jpg b/documentation/asciidoc/computers/raspberry-pi/images/zero-2-w.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/zero-w.jpg b/documentation/asciidoc/computers/raspberry-pi/images/zero-w.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/zero-wh.jpg b/documentation/asciidoc/computers/raspberry-pi/images/zero-wh.jpg
diff --git a/documentation/asciidoc/computers/raspberry-pi/images/zero.jpg b/documentation/asciidoc/computers/raspberry-pi/images/zero.jpg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ include::processors/bcm2711.adoc[]

		include::processors/bcm2712.adoc[]

		include::processors/rp3a0.adoc[]
		include::processors/rp3a0.adoc[]