Merge branch 'master' of a.gmvl.de:/git/m1-debian

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index b29268ae322b18f4787c5b2b2b06cbfb4647b9bc..edd2987c67a38bbf5ba5812ccedcc3b36861f90b 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -18,12 +18,12 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.1-rc5-9;
+        git reset --hard origin/gpu/rust-wip;
         source "$HOME/.cargo/env"
-        curl -sL https://tg.st/u/699384cd214c3e5692d18d0a5a6f30dbcc61cdbc3a6dff5028350d43285feecb.config > .config
+        curl -o .config https://tg.st/u/92ad8143f16d51179975a7dc5f4a50990f57a20c97668a0be746a118f992ed63.config
         make LLVM=-14 olddefconfig
         make LLVM=-14 -j `nproc` V=0 > /dev/null
-        sudo make LLVM=-14 modules_install
+        # sudo make LLVM=-14 V=0 modules_install > /dev/null
         sudo make LLVM=-14 install
 )
 }
@@ -34,7 +34,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.1.8;
+        git reset --hard origin/lina/gpu-wip;
         make -j `nproc`
 )
 }
@@ -45,8 +45,8 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard asahi-v2022.07-4;
-        curl -s https://tg.st/u/0001-usb_setup_descriptor-Add-1ms-delay-in-order-to-unbre.patch | patch -p1
+        git reset --hard asahi-v2022.10-1;
+
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -55,10 +55,6 @@ build_uboot()
         sudo cp u-boot.bin /boot/efi/m1n1/boot.bin
 }
 
-echo "This results in a u-boot which does not have a keybord on the mini."
-echo "This results in a kernel which does not boot."
-exit 1
-
 mkdir -p build
 cd build