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 d740e756e695e9fb89b3018cc7959919d8292908..c6411def1c1155405028d32ea68fddb1a25981df 100644 (file)
--- 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 d9a1dbbc92b0b51e431b551aaaae96f2095a42f0..3226685857e74fafb9c8ce92721e4347fbf72cbe 100644 (file)
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 e20d58035dabd433e1e12636d34efcac4d6d9b9c..55ecea9e3506501beb03dee4c3e30397dd95340a 100644 (file)
--- 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 (file)
index 0000000..fceef77
--- /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[] = {