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;
# 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)"
--- /dev/null
+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[] = {