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

diff --git a/config.edge b/config.edge
index 022f71fcf71143c9623aa7585ed7bf1a28d01c1c..1e6ede16e62a0fc22968640139ffaa3b42d7299b 100644 (file)
--- a/config.edge
+++ b/config.edge
@@ -6356,7 +6356,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-CONFIG_APPLE_DART=m
+CONFIG_APPLE_DART=y
 # CONFIG_ARM_SMMU is not set
 # CONFIG_ARM_SMMU_V3 is not set
 # CONFIG_VIRTIO_IOMMU is not set

diff --git a/gpu.sh b/gpu.sh
index 003f38bdaac7f2291e5138726073ab9e689a9c98..fc94ab241089b9b2e40f58add5db43f2e308b717 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -18,7 +18,7 @@ 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 asahi-6.1-rc5-11;
         source "$HOME/.cargo/env"
         cat ../../config.edge > .config
         make LLVM=-14 olddefconfig
@@ -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,9 +55,7 @@ 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
+echo 'Warning: Has no gpu yet'
 
 mkdir -p build
 cd build