From e27623a7588c822af86c7c2fdef3d173b8f6e467 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 25 Dec 2017 19:29:16 +0100
Subject: [PATCH 1/3] u-boot: install canupdate.sh script

---
 packages/tools/u-boot/package.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 732b3b90bb..076be877d3 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -71,4 +71,15 @@ makeinstall_target() {
     elif [ -f $PROJECT_DIR/$PROJECT/bootloader/update.sh ]; then
       cp -av $PROJECT_DIR/$PROJECT/bootloader/update.sh $INSTALL/usr/share/bootloader
     fi
+
+    # Always install the canupdate script
+    if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/canupdate.sh ]; then
+      cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/canupdate.sh $INSTALL/usr/share/bootloader
+    elif [ -f $PROJECT_DIR/$PROJECT/bootloader/canupdate.sh ]; then
+      cp -av $PROJECT_DIR/$PROJECT/bootloader/canupdate.sh $INSTALL/usr/share/bootloader
+    fi
+    if [ -f $INSTALL/usr/share/bootloader/canupdate.sh ]; then
+      sed -e "s/@PROJECT@/${DEVICE:-$PROJECT}/g" \
+          -i $INSTALL/usr/share/bootloader/canupdate.sh
+    fi
 }

From b482651ba8782bb5210b79188cf642f354418fe3 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 25 Dec 2017 19:29:16 +0100
Subject: [PATCH 2/3] u-boot: add PKG_NEED_UNPACK

---
 packages/tools/u-boot/package.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 076be877d3..53ae248ccb 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -31,6 +31,9 @@ PKG_SHORTDESC="u-boot: Universal Bootloader project"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is intended to be easy to port and to debug, and runs on many supported architectures, including PPC, ARM, MIPS, x86, m68k, NIOS, and Microblaze."
 PKG_IS_KERNEL_PKG="yes"
 
+PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
+[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader"
+
 make_host() {
   make mrproper
   make dummy_x86_config

From 0a8437d3c06f63a5cd48ebb69a4295bf6f4e5fb8 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 25 Dec 2017 19:29:16 +0100
Subject: [PATCH 3/3] u-boot: support project specific version

---
 packages/tools/u-boot/package.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 53ae248ccb..b5f92e700d 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -18,12 +18,9 @@
 ################################################################################
 
 PKG_NAME="u-boot"
-PKG_VERSION="2017.09"
-PKG_SHA256="b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744"
 PKG_ARCH="arm aarch64"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_URL="ftp://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
-PKG_SOURCE_DIR="u-boot-$PKG_VERSION"
+PKG_SOURCE_DIR="u-boot-$PKG_VERSION*"
 PKG_DEPENDS_TARGET="toolchain dtc:host"
 PKG_LICENSE="GPL"
 PKG_SECTION="tools"
@@ -34,6 +31,14 @@ PKG_IS_KERNEL_PKG="yes"
 PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
 [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader"
 
+case "$PROJECT" in
+  *)
+    PKG_VERSION="2017.09"
+    PKG_SHA256="b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744"
+    PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
+    ;;
+esac
+
 make_host() {
   make mrproper
   make dummy_x86_config