From e92b858d9e877a4978b770874cf73c79bbc3c057 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 1 May 2019 16:27:07 +0000
Subject: [PATCH] scripts/image: build an image for each UBOOT_SYSTEM

---
 scripts/image    | 23 +++++++++++++++++++++--
 scripts/image_st | 23 +++++++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/scripts/image b/scripts/image
index 18ea65c562..93bf4b2719 100755
--- a/scripts/image
+++ b/scripts/image
@@ -33,7 +33,7 @@ function do_mkimage() {
     DISTRO="$DISTRO" \
     TARGET_IMG="$TARGET_IMG" \
     BUILD_NAME="$IMAGE_NAME" \
-    IMAGE_NAME="$IMAGE_NAME" \
+    IMAGE_NAME="${1:-$IMAGE_NAME}" \
     INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
     KERNEL_NAME="$KERNEL_NAME" \
@@ -316,7 +316,26 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
     UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
     UUID_STORAGE="$(uuidgen)"
 
-    do_mkimage
+    DEVICE_BOARDS=$($SCRIPTS/uboot_helper "$PROJECT" "$DEVICE")
+
+    if [ "$BOOTLOADER" = "u-boot" -a -z "$UBOOT_SYSTEM" -a -n "$DEVICE" -a -n "$DEVICE_BOARDS" ]; then
+      for UBOOT_SYSTEM in $DEVICE_BOARDS; do
+
+        # Re-install u-boot package
+        rm $STAMPS_INSTALL/u-boot/install_target
+        UBOOT_SYSTEM="$UBOOT_SYSTEM" $SCRIPTS/install u-boot
+
+        # Re-run bootloader/release
+        if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
+          echo "Running $FOUND_PATH"
+          . $FOUND_PATH
+        fi
+
+        do_mkimage "$IMAGE_NAME-$UBOOT_SYSTEM"
+      done
+    else
+      do_mkimage
+    fi
   fi
 
   # Cleanup release dir
diff --git a/scripts/image_st b/scripts/image_st
index 9bc86fa98d..c2275176e1 100755
--- a/scripts/image_st
+++ b/scripts/image_st
@@ -36,7 +36,7 @@ function do_mkimage() {
     DISTRO="$DISTRO" \
     TARGET_IMG="$TARGET_IMG" \
     BUILD_NAME="$IMAGE_NAME" \
-    IMAGE_NAME="$IMAGE_NAME" \
+    IMAGE_NAME="${1:-$IMAGE_NAME}" \
     INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
     KERNEL_NAME="$KERNEL_NAME" \
@@ -366,7 +366,26 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
     UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
     UUID_STORAGE="$(uuidgen)"
 
-    do_mkimage
+    DEVICE_BOARDS=$($SCRIPTS/uboot_helper "$PROJECT" "$DEVICE")
+
+    if [ "$BOOTLOADER" = "u-boot" -a -z "$UBOOT_SYSTEM" -a -n "$DEVICE" -a -n "$DEVICE_BOARDS" ]; then
+      for UBOOT_SYSTEM in $DEVICE_BOARDS; do
+
+        # re-install u-boot package
+        rm $STAMPS_INSTALL/u-boot/install_target
+        UBOOT_SYSTEM="$UBOOT_SYSTEM" $SCRIPTS/install u-boot
+
+        # re-run bootloader/release
+        if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
+          echo "Running $FOUND_PATH"
+          . $FOUND_PATH
+        fi
+
+        do_mkimage "$IMAGE_NAME-$UBOOT_SYSTEM"
+      done
+    else
+      do_mkimage
+    fi
   fi
 
   # cleanup release dir