From c36fada03bbe8e5273e2604577085318d554599b Mon Sep 17 00:00:00 2001
From: Radostan Riedel <raybuntu@googlemail.com>
Date: Tue, 14 Nov 2017 13:48:45 +0100
Subject: [PATCH] Fix image creation for WeTek Devices

---
 projects/Odroid_C2/options    | 2 +-
 projects/WeTek_Core/options   | 2 +-
 projects/WeTek_Hub/options    | 2 +-
 projects/WeTek_Play/options   | 2 +-
 projects/WeTek_Play_2/options | 2 +-
 scripts/image                 | 1 +
 scripts/mkimage               | 4 ++--
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/projects/Odroid_C2/options b/projects/Odroid_C2/options
index 64e2f2a822..fcf4dcb113 100644
--- a/projects/Odroid_C2/options
+++ b/projects/Odroid_C2/options
@@ -37,7 +37,7 @@
     BOOTLOADER="u-boot"
 
   # u-boot version to use (default)
-    UBOOT_VERSION="hardkernel"
+    UBOOT_VERSION="vendor"
 
   # Configuration for u-boot
     UBOOT_CONFIG="odroidc2_defconfig"
diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options
index 4ecc2c2395..d726943b3e 100644
--- a/projects/WeTek_Core/options
+++ b/projects/WeTek_Core/options
@@ -40,7 +40,7 @@
     BOOTLOADER="u-boot"
 
   # u-boot version to use (default)
-    UBOOT_VERSION=""
+    UBOOT_VERSION="vendor"
 
   # Configuration for u-boot
     UBOOT_CONFIG=""
diff --git a/projects/WeTek_Hub/options b/projects/WeTek_Hub/options
index b41ef6e066..4eb080dbf2 100644
--- a/projects/WeTek_Hub/options
+++ b/projects/WeTek_Hub/options
@@ -37,7 +37,7 @@
     BOOTLOADER="u-boot"
 
   # u-boot version to use (default)
-    UBOOT_VERSION=""
+    UBOOT_VERSION="vendor"
 
   # Configuration for u-boot
     UBOOT_CONFIG=""
diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
index 691dd1aaf7..7a91a5764f 100644
--- a/projects/WeTek_Play/options
+++ b/projects/WeTek_Play/options
@@ -40,7 +40,7 @@
     BOOTLOADER="u-boot"
 
   # u-boot version to use (default)
-    UBOOT_VERSION=""
+    UBOOT_VERSION="vendor"
 
   # Configuration for u-boot
     UBOOT_CONFIG=""
diff --git a/projects/WeTek_Play_2/options b/projects/WeTek_Play_2/options
index 4b6a0e9c72..ae82409cde 100644
--- a/projects/WeTek_Play_2/options
+++ b/projects/WeTek_Play_2/options
@@ -37,7 +37,7 @@
     BOOTLOADER="u-boot"
 
   # u-boot version to use (default)
-    UBOOT_VERSION=""
+    UBOOT_VERSION="vendor"
 
   # Configuration for u-boot
     UBOOT_CONFIG=""
diff --git a/scripts/image b/scripts/image
index 24cf126c92..6254bc2612 100755
--- a/scripts/image
+++ b/scripts/image
@@ -342,6 +342,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       RELEASE_DIR=$RELEASE_DIR \
       UUID_STORAGE="$(uuidgen)" \
       UBOOT_SYSTEM="$UBOOT_SYSTEM" \
+      UBOOT_VERSION="$UBOOT_VERSION" \
       EXTRA_CMDLINE="$EXTRA_CMDLINE" \
       SYSTEM_SIZE="$SYSTEM_SIZE" \
       SYSTEM_PART_START="$SYSTEM_PART_START" \
diff --git a/scripts/mkimage b/scripts/mkimage
index 2e993c3848..70d3d42970 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -225,11 +225,11 @@ EOF
       mcopy -s $RELEASE_DIR/3rdparty/bootloader/overlays ::
     fi
 
-elif [ "$BOOTLOADER" = "u-boot" -a \( -n "$UBOOT_SYSTEM" -o "$PROJECT" = "Odroid_C2" \) ]; then
+elif [ "$BOOTLOADER" = "u-boot" -a \( -n "$UBOOT_SYSTEM" -o "$UBOOT_VERSION" = "vendor" \) ]; then
   # create bootloader configuration
     echo "image: creating bootloader configuration..."
 
-    if [ "$PROJECT" != "Odroid_C2" ]; then
+    if [ "$UBOOT_VERSION" != "vendor" ]; then
       DTB="$($SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM dtb)"
 
       if [ -f "$RELEASE_DIR/3rdparty/bootloader/$DTB" ]; then