From 1c22b7a1f2589e18fc78bcf49b05a9149b664b5d Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Thu, 18 Feb 2021 23:07:05 +0100
Subject: [PATCH] bcm27xx: add support for RPI CM4 and RPI 400
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Support added to bcm2709 (32 bits) and bcm2711 (64 bits).

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit 8ad61118fd)
---
 .../bcm27xx/base-files/etc/board.d/02_network   |  2 ++
 target/linux/bcm27xx/image/Makefile             | 17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/target/linux/bcm27xx/base-files/etc/board.d/02_network b/target/linux/bcm27xx/base-files/etc/board.d/02_network
index 36c8c5df1a..665504a3fc 100755
--- a/target/linux/bcm27xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm27xx/base-files/etc/board.d/02_network
@@ -18,6 +18,8 @@ raspberrypi,2-model-b |\
 raspberrypi,2-model-b-rev2 |\
 raspberrypi,3-model-b |\
 raspberrypi,3-model-b-plus |\
+raspberrypi,400 |\
+raspberrypi,4-compute-module |\
 raspberrypi,4-model-b)
 	ucidef_set_interface_lan "eth0"
 	;;
diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index fbef5ecbf4..30b3e83cf6 100644
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -90,19 +90,19 @@ define Device/rpi-2
   DEVICE_ALT0_MODEL := 3B/3B+/3CM
   DEVICE_ALT0_VARIANT := (32bit)
   DEVICE_ALT1_VENDOR := Raspberry Pi
-  DEVICE_ALT1_MODEL := 4B
+  DEVICE_ALT1_MODEL := 4B/400/4CM
   DEVICE_ALT1_VARIANT := (32bit)
   DEVICE_DTS := \
 	bcm2709-rpi-2-b bcm2710-rpi-2-b \
 	bcm2710-rpi-3-b bcm2710-rpi-3-b-plus \
-	bcm2711-rpi-4-b \
-	bcm2710-rpi-cm3
+	bcm2711-rpi-4-b bcm2711-rpi-400 \
+	bcm2710-rpi-cm3 bcm2711-rpi-cm4
   SUPPORTED_DEVICES := \
 	rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm \
 	raspberrypi,2-model-b raspberrypi,2-model-b-rev2 \
 	raspberrypi,3-model-b raspberrypi,3-model-b-plus \
 	raspberrypi,3-compute-module raspberrypi,compute-module-3 \
-	raspberrypi,4-model-b
+	raspberrypi,400 raspberrypi,4-compute-module raspberrypi,4-model-b
   DEVICE_PACKAGES := \
 	cypress-firmware-43430-sdio \
 	cypress-nvram-43430-sdio-rpi-3b \
@@ -144,11 +144,16 @@ ifeq ($(SUBTARGET),bcm2710)
 endif
 
 define Device/rpi-4
-  DEVICE_MODEL := 4B
+  DEVICE_MODEL := 4B/400/4CM
   DEVICE_VARIANT := (64bit)
   KERNEL_IMG := kernel8.img
-  DEVICE_DTS := broadcom/bcm2711-rpi-4-b
+  DEVICE_DTS := \
+	broadcom/bcm2711-rpi-400 \
+	broadcom/bcm2711-rpi-4-b \
+	broadcom/bcm2711-rpi-cm4
   SUPPORTED_DEVICES := \
+	raspberrypi,400 \
+	raspberrypi,4-compute-module \
 	raspberrypi,4-model-b
   DEVICE_PACKAGES := \
 	cypress-firmware-43455-sdio \
-- 
2.30.2