switch to 4k

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 8f2edc71a4a70aafc77882419877252ccc0b73c5..6b747ff0a985a8428fc4762a72e2d8ed8af716e6 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,8 +28,8 @@ build_linux()
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-        curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
-        curl -s https://tg.st/u/config-2022-03-17-distro-sven-jannau.txt > .config
+        curl -s https://tg.st/u/0001-4k-iommu-patch-2022-07-20.patch | git am -
+        curl -s https://tg.st/u/config-2022-07-19-4k.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -38,11 +38,10 @@ build_linux()
 build_m1n1()
 {
 (
-        test -d m1n1 || git clone --recursive https://github.com/jannau/m1n1
+        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch
-        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 -
+        git reset --hard origin/main; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -62,7 +61,10 @@ 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
+        cp u-boot.bin 2k.bin
+        echo 'display=2560x1440' >> 2k.bin
         echo 'display=wait,3840x2160' >> 4k.bin
+
 }
 
 build_rootfs()
@@ -194,7 +196,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 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/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 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