u-boot-script-boundary: correctly build sabrelite bootscripts

Build bootscript for sabrelite with correct MACHINE_ARCH.
Also add dependency to image, so that bootscripts are built
for sdcard image.

Change-Id: I6cbf8d0b35b9aaa828ef26740384135c8691b11d
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index cf92174..dc88e81 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -13,6 +13,8 @@ IMAGE_FEATURES += "\
 
 inherit core-image
 
+EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary"
+
 MACHINE_EXTRA_INSTALL = ""
 
 MACHINE_EXTRA_INSTALL_mx6 += "\
diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend
index 2f02fb6..8db57e0 100644
--- a/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -1,9 +1,6 @@
-MACHINE = "nitrogen6x"
 
-do_deploy_append () {
-    cd ${DEPLOYDIR}
-    rm -f 6x_bootscript 6x_upgrade
-    ln -sf 6x_bootscript-${MACHINE}-${PV}-${PR} 6x_bootscript
-    ln -sf 6x_upgrade-${MACHINE}-${PV}-${PR} 6x_upgrade
+do_mkimage_prepend () {
+    if [ ! -e board/boundary/${MACHINE} ]; then
+        cp -r board/boundary/nitrogen6x board/boundary/${MACHINE}
+    fi
 }
-