Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index c188a14d2d299c520f7ff699baab3629eb8446e3..0d143eb6a3eda030fdfcb899932563724419a44d 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,6 +31,7 @@ build_uboot()
 )
 
         cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
 build_linux()
@@ -154,9 +155,9 @@ upload_artefacts()
 mkdir -p build
 cd build
 
-build_linux
 build_m1n1
 build_uboot
+build_linux
 build_rootfs
 build_live_stick
 build_di_stick