From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 26 Oct 2022 16:36:02 +0000 (+0200)
Subject: Merge branch 'master' of 88.198.237.222:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/54c7b54f0a84ddf541acff8939943df3ad52bbc8?hp=409bd8cb215724a0ff602a54f6785cc6c5b2bc22

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

diff --git a/gpu.sh b/gpu.sh
index c875e0c..3ad63e5 100644
--- a/gpu.sh
+++ b/gpu.sh
@@ -14,7 +14,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/asahi-wip;
+        git reset --hard origin/gpu/rust-wip;
         curl -sL https://tg.st/u/e633ae8c7e2f16d7bc845a0695e583a836d94846e1c33da182216e565c3769c4.config > .config
         make olddefconfig
         make -j `nproc` V=0 > /dev/null
@@ -53,6 +53,6 @@ build_uboot()
 mkdir -p build
 cd build
 
-build_linux
+#build_linux
 build_m1n1
 build_uboot
diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index 6b4c701..2bc15b8 100644
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -69,6 +69,7 @@ my %asahi_options = (
         'CONFIG_APPLE_M1_CPU_PMU' => 'y',
         'CONFIG_SND_SOC_CS42L83' => 'm',
         'CONFIG_DRM_APPLE' => 'y',
+        'CONFIG_DRM_ASAHI' => 'y',
 );
 
 my %debian_options;