From 39ddb25fbd3d14b0b96c6177c939826bfd4de31b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Thu, 19 Sep 2019 17:32:44 +0200
Subject: [PATCH] brcm2708: add support for Raspberry Pi 2B 1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

RPi 2B 1.2 has a BCM2710/BCM2837 like RPi 3 devices.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 .../base-files/etc/board.d/02_network         |  1 +
 .../lib/preinit/05_set_preinit_iface_brcm2708 |  1 +
 target/linux/brcm2708/image/Makefile          | 21 ++++++++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
index 33aa15d85e..36c8c5df1a 100755
--- a/target/linux/brcm2708/base-files/etc/board.d/02_network
+++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
@@ -15,6 +15,7 @@ raspberrypi,model-b |\
 raspberrypi,model-b-plus |\
 raspberrypi,model-b-rev2 |\
 raspberrypi,2-model-b |\
+raspberrypi,2-model-b-rev2 |\
 raspberrypi,3-model-b |\
 raspberrypi,3-model-b-plus |\
 raspberrypi,4-model-b)
diff --git a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
index bbb95149c2..de221ae7ad 100644
--- a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
+++ b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
@@ -7,6 +7,7 @@ set_preinit_iface() {
 
 	case "$(board_name)" in
 	raspberrypi,2-model-b |\
+	raspberrypi,2-model-b-rev2 |\
 	raspberrypi,3-model-b |\
 	raspberrypi,3-model-b-plus |\
 	raspberrypi,4-model-b |\
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 01d1bf585f..db2b3b5562 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -72,7 +72,10 @@ endef
 
 define Device/rpi
   DEVICE_MODEL := B/B+/CM/Zero/ZeroW
-  DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-zero bcm2708-rpi-zero-w
+  DEVICE_DTS := \
+	bcm2708-rpi-b bcm2708-rpi-b-plus \
+	bcm2708-rpi-cm \
+	bcm2708-rpi-zero bcm2708-rpi-zero-w
   SUPPORTED_DEVICES := \
 	rpi-b rpi-b-plus rpi-cm rpi-zero rpi-zero-w \
 	raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,model-b-rev2 \
@@ -89,10 +92,14 @@ endif
 
 define Device/rpi-2
   DEVICE_MODEL := 2B/3B/3B+/3CM/4B
-  DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2711-rpi-4-b bcm2710-rpi-cm3
+  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
   SUPPORTED_DEVICES := \
 	rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm \
-	raspberrypi,2-model-b \
+	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
@@ -110,11 +117,15 @@ ifeq ($(SUBTARGET),bcm2709)
 endif
 
 define Device/rpi-3
-  DEVICE_MODEL := 3B/3B+/3CM
+  DEVICE_MODEL := 2B-1.2/3B/3B+/3CM
   KERNEL_IMG := kernel8.img
-  DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3
+  DEVICE_DTS := \
+	broadcom/bcm2710-rpi-2-b \
+	broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus \
+	broadcom/bcm2710-rpi-cm3
   SUPPORTED_DEVICES := \
 	rpi-3-b rpi-3-b-plus \
+	raspberrypi,2-model-b-rev2 \
 	raspberrypi,3-model-b raspberrypi,3-model-b-plus \
 	raspberrypi,3-compute-module raspberrypi,compute-module-3
   DEVICE_PACKAGES := \
-- 
2.30.2