X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/433c07302294bd4124ae02b598b81a61f35bbc17..4de299221ddbc1aca648ae51d383c5e1cfc7951c:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 6b747ff..0e02c29 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +29,7 @@ build_linux()
         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-07-20.patch | git am -
-        curl -s https://tg.st/u/config-2022-07-19-4k.txt > .config
+        curl -s https://tg.st/u/config-2022-08-13-4k.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -41,7 +41,8 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch
-        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
+        git reset --hard v1.1.3; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -50,10 +51,13 @@ build_uboot()
 {
 (
         handle_crosscompile
-        test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot
+        test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch
-        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
+        # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
+        git reset --hard asahi-v2022.07-2; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/0001-usb-storage-continue-probe-on-Invalid-device.patch | git am -
+        git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
         make apple_m1_defconfig
         make -j `nproc`
 )