Merge pull request #2696 from raspberrypi/develop

Alasdair Allan · web-flow · commit 7a650c9a3a7c · 2022-11-14T10:15:59.000Z
Push to production
diff --git a/documentation/asciidoc/computers/config_txt/conditional.adoc b/documentation/asciidoc/computers/config_txt/conditional.adoc
@@ -29,14 +29,17 @@ The conditional model filters are applied according to the following table.
 | Model 3A+, Model 3B+
 
 | [pi4]
-| Model 4B, Pi 400, Compute Module 4
+| Model 4B, Pi 400, Compute Module 4, Compute Module 4S
 
 | [pi400]
 | Pi 400
 
 | [cm4]
 | Compute Module 4
 
+| [cm4s]
+| Compute Module 4S
+
 | [pi0]
 | Zero, Zero W, Zero 2 W
 
diff --git a/documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc b/documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc
@@ -326,6 +326,10 @@ NOQuuuWuFMMMCCCCPPPPTTTTTTTTRRRR
 |
 | 14: CM4
 
+|
+|
+| 15: CM4S
+
 | RRRR
 | Revision
 | 0, 1, 2, etc.
