From 26cddbe840d1bc15fb2f5a7a3ddd7036ab132521 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 26 Mar 2018 23:39:47 +0300
Subject: [PATCH 1/4] raspberrypi (1,2,3): fw-prepare-boot: add a newline
 before adding initramfs line

---
 board/raspberrypi/overlay/usr/libexec/fw-prepare-boot  | 1 +
 board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot | 1 +
 board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot | 1 +
 3 files changed, 3 insertions(+)

diff --git a/board/raspberrypi/overlay/usr/libexec/fw-prepare-boot b/board/raspberrypi/overlay/usr/libexec/fw-prepare-boot
index e114525d86..e930649d1c 100755
--- a/board/raspberrypi/overlay/usr/libexec/fw-prepare-boot
+++ b/board/raspberrypi/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo >> /boot/config.txt
 echo "initramfs fwupdater.gz" >> /boot/config.txt
 
diff --git a/board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot b/board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot
index e114525d86..e930649d1c 100755
--- a/board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot
+++ b/board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo >> /boot/config.txt
 echo "initramfs fwupdater.gz" >> /boot/config.txt
 
diff --git a/board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot b/board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot
index e114525d86..e930649d1c 100755
--- a/board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot
+++ b/board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo >> /boot/config.txt
 echo "initramfs fwupdater.gz" >> /boot/config.txt
 

From abab8ab0801209f4425d148e37ff7d06715f9fea Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 31 Mar 2018 16:51:15 +0300
Subject: [PATCH 2/4] raspberrypi (all): update firmware, userland and kernel

---
 configs/raspberrypi2_defconfig       | 2 +-
 configs/raspberrypi3_defconfig       | 4 ++--
 configs/raspberrypi_defconfig        | 2 +-
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 package/rpi-userland/rpi-userland.mk | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index c1ded3d448..57856200f4 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6820d0cbec64cfee481b961833feffec8880111e.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 1976deedfe..4dcc16d50d 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -14,10 +14,10 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6820d0cbec64cfee481b961833feffec8880111e.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_ALSA_UTILS=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 491b11a717..3f11a9dbc0 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6820d0cbec64cfee481b961833feffec8880111e.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 29f31e891c..8150e57db1 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 93aae1391121c44c7bbddf66abaf38725ffa2dc0
+RPI_FIRMWARE_VERSION = ce8652e2c743f02f04cb29f23611cbf13765483b
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index bc730f11c3..966179e5c5 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 3cd60d45bc7c9d3ec8daee574bc99027cb1bab9e
+RPI_USERLAND_VERSION = a343dcad1dae4e93f4bfb99496697e207f91027e
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3-Clause
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 65cc6e10034b0b041a26b5cc62bd3cd028a4fa1b Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 31 Mar 2018 17:10:35 +0300
Subject: [PATCH 3/4] build.sh: clean-target: remove .stamp_images_installed
 files

---
 build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 86e48ba056..4ffd9268cf 100755
--- a/build.sh
+++ b/build.sh
@@ -102,6 +102,9 @@ elif [ "$target" == "clean-target" ]; then
 
         echo "removing .stamp_host_installed files"
         find $outputdir/build -name .stamp_host_installed | xargs -r rm
+
+        echo "removing .stamp_images_installed files"
+        find $outputdir/build -name .stamp_images_installed | xargs -r rm
     fi
 
     if [ -f $outputdir/.config ]; then
@@ -118,7 +121,7 @@ elif [ -n "$target" ]; then
     make O=$outputdir $target
 
 else  # if [ -z "$target ]
-    $0 $b all
+    $0 $board all
     echo "build successful"
 fi
 

From 7e1148d9822df392d66fccb5e26f611f39807d65 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 31 Mar 2018 17:30:49 +0300
Subject: [PATCH 4/4] postscript.sh: exit at first error

---
 board/bananapi/postscript.sh     |  2 ++
 board/common/postscript.sh       | 10 ++++++++--
 board/nanopineo2/postscript.sh   |  2 ++
 board/odroidc1/postscript.sh     |  2 ++
 board/odroidc2/postscript.sh     |  2 ++
 board/odroidxu4/postscript.sh    |  2 ++
 board/orangepione/postscript.sh  |  2 ++
 board/pine64/postscript.sh       |  2 ++
 board/raspberrypi/postscript.sh  |  2 ++
 board/raspberrypi2/postscript.sh |  2 ++
 board/raspberrypi3/postscript.sh |  4 ++++
 11 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh
index 9c46b9aa1b..57228f0501 100755
--- a/board/bananapi/postscript.sh
+++ b/board/bananapi/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 UBOOT_HOST_DIR=$TARGET/../build/host-uboot-tools-*
 
 cp $IMG_DIR/uImage $BOOT_DIR
diff --git a/board/common/postscript.sh b/board/common/postscript.sh
index a24f1d9e90..bc54ee45c9 100755
--- a/board/common/postscript.sh
+++ b/board/common/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 export TARGET="$1"
 export BOARD=$(basename $(dirname $TARGET))
 export COMMON_DIR=$(dirname $0)
@@ -9,7 +11,9 @@ export IMG_DIR=$TARGET/../images
 
 mkdir -p $BOOT_DIR
 
-test -x $BOARD_DIR/postscript.sh && $BOARD_DIR/postscript.sh
+if [ -x $BOARD_DIR/postscript.sh ]; then
+    $BOARD_DIR/postscript.sh
+fi
 
 # transform /var contents as needed
 rm -rf $TARGET/var/cache
@@ -30,7 +34,9 @@ ln -s /tmp $TARGET/var/tmp
 
 # cleanups
 $COMMON_DIR/cleanups.sh
-test -x $BOARD_DIR/cleanups.sh && test -x $BOARD_DIR/cleanups.sh || true
+if [ -x $BOARD_DIR/cleanups.sh ]; then
+    $BOARD_DIR/cleanups.sh
+fi
 
 # board-specific os.conf
 if [ -r $BOARD_DIR/os.conf ]; then
diff --git a/board/nanopineo2/postscript.sh b/board/nanopineo2/postscript.sh
index 4861a24812..c86407b13e 100755
--- a/board/nanopineo2/postscript.sh
+++ b/board/nanopineo2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
 
diff --git a/board/odroidc1/postscript.sh b/board/odroidc1/postscript.sh
index aeac335477..ccf44bb4e0 100755
--- a/board/odroidc1/postscript.sh
+++ b/board/odroidc1/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/odroidc2/postscript.sh b/board/odroidc2/postscript.sh
index 2f2bd36d2e..0296849600 100755
--- a/board/odroidc2/postscript.sh
+++ b/board/odroidc2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/odroidxu4/postscript.sh b/board/odroidxu4/postscript.sh
index fb66999494..1a965ae5c8 100755
--- a/board/odroidxu4/postscript.sh
+++ b/board/odroidxu4/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/orangepione/postscript.sh b/board/orangepione/postscript.sh
index 54b02911f4..6b2bf27881 100755
--- a/board/orangepione/postscript.sh
+++ b/board/orangepione/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
 
diff --git a/board/pine64/postscript.sh b/board/pine64/postscript.sh
index 284948746c..5e8cc683d1 100755
--- a/board/pine64/postscript.sh
+++ b/board/pine64/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR/pine64
 
diff --git a/board/raspberrypi/postscript.sh b/board/raspberrypi/postscript.sh
index 7b0b4b28b4..31683c5e03 100755
--- a/board/raspberrypi/postscript.sh
+++ b/board/raspberrypi/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
diff --git a/board/raspberrypi2/postscript.sh b/board/raspberrypi2/postscript.sh
index eccf760684..bb556320bd 100755
--- a/board/raspberrypi2/postscript.sh
+++ b/board/raspberrypi2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
diff --git a/board/raspberrypi3/postscript.sh b/board/raspberrypi3/postscript.sh
index c76bfb264c..df98ae0de2 100755
--- a/board/raspberrypi3/postscript.sh
+++ b/board/raspberrypi3/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
@@ -7,6 +9,8 @@ cp $BOARD_DIR/cmdline.txt $BOOT_DIR
 cp $BOARD_DIR/fwupdater.gz $BOOT_DIR
 cp $IMG_DIR/zImage $BOOT_DIR/kernel.img
 cp $IMG_DIR/bcm2710-rpi-3-b.dtb $BOOT_DIR
+cp $IMG_DIR/bcm2710-rpi-3-b-plus.dtb $BOOT_DIR
+cp $IMG_DIR/bcm2710-rpi-cm3.dtb $BOOT_DIR
 cp $RPI_FW_DIR/bootcode.bin $BOOT_DIR
 cp $RPI_FW_DIR/start.elf $BOOT_DIR
 cp $RPI_FW_DIR/fixup.dat $BOOT_DIR