Merge branch 'master' of 88.198.237.222:/git/m1-debian

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index 003f38bdaac7f2291e5138726073ab9e689a9c98..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"
-        cat ../../config.edge > .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 V=0 modules_install > /dev/null
+        # 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,7 +45,7 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard origin/asahi;
+        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 'Has no gpu yet'
-echo 'Boot but crashes shortly after. Do not use.'
-exit 1
-
 mkdir -p build
 cd build