use the branch recommended from jannau

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 36661651b375ca9b7133145908ccedfbb3389974..caa1b116ce83368d0800992af1834e5fccd392ed 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,7 +42,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/jannau/m1n1
         cd m1n1
         git fetch
-        git reset --hard origin/display_fb_alloc; git clean -f -x -d &> /dev/null
+        git reset --hard origin/display_fb_alloc2; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/0001-display-Add-wait-option-to-handle-monitor-disconnect.patch | git am -
         make -j `nproc`
 )
@@ -62,6 +62,8 @@ build_uboot()
 
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
         cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.macho
+        cp u-boot.bin 4k.bin
+        echo 'display=wait,3840x2160' >> 4k.bin
 }
 
 build_rootfs()
@@ -193,7 +195,7 @@ publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
 }
 
 mkdir -p build