From 4f98e9fb1a2c5680d04c53c60b79d5b4f6d01d98 Mon Sep 17 00:00:00 2001 From: Thomas Glanzmann Date: Thu, 17 Nov 2022 19:42:29 +0100 Subject: [PATCH] +CONFIG_APPLE_DART=y as suggeested by Jannau. Fixes DCP on mini --- config.edge | 2 +- gpu.sh | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/config.edge b/config.edge index 022f71f..1e6ede1 100644 --- 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 003f38b..fc94ab2 100644 --- 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 -- 2.35.1