bcm27xx: update device definitions for 6.18

Synchronize the device definitions with the current rpi-6.18.y kernel tree.

Add newly introduced DTBs, update supported device identifiers, and
refresh the displayed model names to reflect the supported hardware.

Retain legacy SUPPORTED_DEVICES aliases where necessary to preserve
sysupgrade compatibility.

Signed-off-by: Joshua Covington <joshuacov@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23703
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index 0a83d1e733b1781bf11d864340f703c90f15f608..95a2d25be59fdc6901ad442bb93e0bd018ca7b3f 100644 (file)
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -73,8 +73,8 @@ endef
 define Device/rpi
   DEVICE_MODEL := A/A+/B/B+/CM/Zero/ZeroW
   DEVICE_DTS := \
-       broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b-plus \
-       broadcom/bcm2708-rpi-cm \
+       broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-rev1 \
+       broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm \
        broadcom/bcm2708-rpi-zero broadcom/bcm2708-rpi-zero-w
   SUPPORTED_DEVICES := \
        rpi-a rpi-a-plus \
@@ -100,30 +100,32 @@ define Device/rpi-2
   DEVICE_MODEL := 2B/2B 1.2
   DEVICE_VARIANT := (32bit)
   DEVICE_ALT0_VENDOR := Raspberry Pi
-  DEVICE_ALT0_MODEL := 3A+/3B/3B+/CM3/Zero2/Zero2W
+  DEVICE_ALT0_MODEL := 3A+/3B/3B+/CM3/Zero2/Zero2W/CM0
   DEVICE_ALT0_VARIANT := (32bit)
   DEVICE_ALT1_VENDOR := Raspberry Pi
-  DEVICE_ALT1_MODEL := 4B/400/CM4
+  DEVICE_ALT1_MODEL := 4B/400/CM4/CM4S
   DEVICE_ALT1_VARIANT := (32bit)
   DEVICE_DTS := \
        broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b \
        broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus \
-       broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 \
-       broadcom/bcm2710-rpi-cm3 broadcom/bcm2711-rpi-cm4 \
-       broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w
+       broadcom/bcm2710-rpi-cm3 broadcom/bcm2711-rpi-4-b \
+       broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4-io \
+       broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s \
+       broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w \
+       broadcom/bcm2710-rpi-cm0
   SUPPORTED_DEVICES := \
        rpi-2-b \
        rpi-3-a-plus \
        rpi-3-b rpi-3-b-plus \
        rpi-4-b rpi-400 \
-       rpi-cm \
-       rpi-zero-2 rpi-zero-2-w \
+       rpi-cm rpi-cm3 \
+       rpi-zero-2 rpi-zero-2-w rpi-cm0 \
        raspberrypi,2-model-b raspberrypi,2-model-b-rev2 \
-       raspberrypi,3-model-a-plus \
-       raspberrypi,3-model-b raspberrypi,3-model-b-plus \
-       raspberrypi,3-compute-module raspberrypi,compute-module-3 \
-       raspberrypi,400 raspberrypi,4-compute-module raspberrypi,4-model-b \
-       raspberrypi,model-zero-2 raspberrypi,model-zero-2-w
+       raspberrypi,3-model-a-plus raspberrypi,3-model-b \
+       raspberrypi,3-model-b-plus raspberrypi,3-compute-module \
+       raspberrypi,compute-module-3 raspberrypi,400 \
+       raspberrypi,4-compute-module raspberrypi,4-compute-module-s raspberrypi,4-model-b \
+       raspberrypi,model-zero-2 raspberrypi,model-zero-2-w raspberrypi,0-compute-module
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
        brcmfmac-nvram-43430-sdio \
@@ -140,7 +142,7 @@ ifeq ($(SUBTARGET),bcm2709)
 endif
 
 define Device/rpi-3
-  DEVICE_MODEL := 3A+/3B/3B+/CM3/Zero2/Zero2W
+  DEVICE_MODEL := 3A+/3B/3B+/CM3/Zero2/Zero2W/CM0
   DEVICE_VARIANT := (64bit)
   DEVICE_ALT0_VENDOR := Raspberry Pi
   DEVICE_ALT0_MODEL := 2B-1.2
@@ -149,17 +151,17 @@ define Device/rpi-3
   DEVICE_DTS := \
        broadcom/bcm2710-rpi-2-b \
        broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus \
-       broadcom/bcm2710-rpi-cm3 \
+       broadcom/bcm2710-rpi-cm3 broadcom/bcm2710-rpi-cm0 \
        broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w
   SUPPORTED_DEVICES := \
        rpi-3-a-plus \
-       rpi-3-b rpi-3-b-plus \
-       rpi-zero-2 rpi-zero-2-w \
+       rpi-3-b rpi-3-b-plus rpi-cm3 \
+       rpi-zero-2 rpi-zero-2-w rpi-cm0 \
        raspberrypi,2-model-b-rev2 \
        raspberrypi,3-model-a-plus \
        raspberrypi,3-model-b raspberrypi,3-model-b-plus \
        raspberrypi,3-compute-module raspberrypi,compute-module-3 \
-       raspberrypi,model-zero-2 raspberrypi,model-zero-2-w
+       raspberrypi,model-zero-2 raspberrypi,model-zero-2-w raspberrypi,0-compute-module
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
        brcmfmac-nvram-43430-sdio \
@@ -174,16 +176,19 @@ ifeq ($(SUBTARGET),bcm2710)
 endif
 
 define Device/rpi-4
-  DEVICE_MODEL := 4B/400/CM4
+  DEVICE_MODEL := 4B/400/CM4/CM4S
   DEVICE_VARIANT := (64bit)
   KERNEL_IMG := kernel8.img
   DEVICE_DTS := \
-       broadcom/bcm2711-rpi-400 \
        broadcom/bcm2711-rpi-4-b \
-       broadcom/bcm2711-rpi-cm4
+       broadcom/bcm2711-rpi-400 \
+       broadcom/bcm2711-rpi-cm4-io \
+       broadcom/bcm2711-rpi-cm4 \
+       broadcom/bcm2711-rpi-cm4s
   SUPPORTED_DEVICES := \
        raspberrypi,400 \
        raspberrypi,4-compute-module \
+       raspberrypi,4-compute-module-s \
        raspberrypi,4-model-b
   DEVICE_PACKAGES := \
        cypress-firmware-43455-sdio \
@@ -203,10 +208,12 @@ ifeq ($(SUBTARGET),bcm2711)
 endif
 
 define Device/rpi-5
-  DEVICE_MODEL := 5/500/CM5
+  DEVICE_MODEL := 5/500/CM5/CM5L
   KERNEL_IMG := kernel_2712.img
   DEVICE_DTS := \
+       broadcom/bcm2712-d-rpi-5-b \
        broadcom/bcm2712-rpi-5-b \
+       broadcom/bcm2712-rpi-500 \
        broadcom/bcm2712-rpi-cm5-cm4io \
        broadcom/bcm2712-rpi-cm5-cm5io \
        broadcom/bcm2712-rpi-cm5l-cm4io \