X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/a905e370171bb20d0017a3fb097fd0c0d1c1e4de..68cd47dd463475dfb7032fb866ad9fc6cc1a4e34:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9ffa72f..632f74e 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# SPDX-License-Identifier: MIT
+
 set -x
 set -e
 
@@ -21,33 +23,32 @@ build_uboot()
 {
 (
         # Build u-boot
-        test -d u-boot || git clone https://github.com/kettenis/u-boot
+        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot
         cd u-boot
         git fetch
-        git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
+        git reset --hard origin/x2r10g10b10; git clean -f -x -d
         make apple_m1_defconfig
-        # it is normal that it runs on an error at the end
-        make -j 16 || true
+        make -j 16
 )
 
-        cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
 build_linux()
 {
 (
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
         cd linux
         git fetch
-        git reset --hard origin/asahi; git clean -f -x -d
+        git reset --hard smc/work; git clean -f -x -d
         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
+        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
+        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
+        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+
         make olddefconfig
         make -j 16 bindeb-pkg
 )
@@ -152,7 +153,7 @@ upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin di-stick/vmlinuz k.deb
+        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb
 }
 
 mkdir -p build