more notes

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9ffa72f4e5ba53ab3bc2544a9a62fdd28c476658..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()
@@ -43,10 +44,6 @@ build_linux()
         curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
         curl -s https://tg.st/u/5nly | git am -
         curl -s https://tg.st/u/0wM8 | git am -
-        curl -s https://tg.st/u/114e7b2c8bcbbdd2aade6711169d65fc1cbaafb5.patch | git am -
-        curl -s https://tg.st/u/1e286fea8f626d571aed6e620f4e166a694317c2.patch | git am -
-        curl -s https://tg.st/u/888add910ab5dd1b7500fd2583d8ba5aa73538f3.patch | git am -
-        curl -s https://tg.st/u/d0801e9a20532025b82c06342da068da9aa12967.patch | git am -
         curl -s https://tg.st/u/config-2022-01-28 > .config
         make olddefconfig
         make -j 16 bindeb-pkg
@@ -158,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