From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 May 2018 08:43:58 +0000 (+0200)
Subject: u-boot: add Raspberry Pi 3 Model B+
X-Git-Tag: v2.21-core122~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=959b404ee0bccd4222055bf75b91d230dda6f65c;p=people%2Fstevee%2Fipfire-2.x.git

u-boot: add Raspberry Pi 3 Model B+

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index d740e756e6..c6411def1c 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -34,10 +34,14 @@ fi;
 if test "${SERIAL-CONSOLE}" = "ON"; then
 	if test ${console} = ""; then
 		if test "${board}" = "rpi"; then
-			if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+			if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
 				setenv console ttyS1,115200n8;
 			else
-				setenv console ttyAMA0,115200n8;
+				if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+					setenv console ttyS1,115200n8;
+				else
+					setenv console ttyAMA0,115200n8;
+				fi;
 			fi;
 		else
 			setenv console ttyS0,115200n8;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index d9a1dbbc92..3226685857 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/lfs/u-boot b/lfs/u-boot
index e20d58035d..55ecea9e35 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -123,6 +123,7 @@ ifneq "$(MKIMAGE)" "1"
 
 	# Raspberry Pi 3
 	-mkdir -pv /usr/share/u-boot/rpi3
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_32b_config
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
diff --git a/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch b/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
new file mode 100644
index 0000000000..fceef77386
--- /dev/null
+++ b/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
@@ -0,0 +1,15 @@
+diff -Naur u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c u-boot-2018.03/board/raspberrypi/rpi/rpi.c
+--- u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c	2018-03-13 13:02:19.000000000 +0100
++++ u-boot-2018.03/board/raspberrypi/rpi/rpi.c	2018-05-14 13:40:38.418660145 +0200
+@@ -111,6 +111,11 @@
+ 		DTB_DIR "bcm2835-rpi-zero-w.dtb",
+ 		false,
+ 	},
++	[0xD] = {
++		"3 Model B+",
++		DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
++		true,
++	},
+ };
+ 
+ static const struct rpi_model rpi_models_old_scheme[] = {