From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Tue, 10 Oct 2023 18:55:59 +0000 (+0200)
Subject: simplify build script and get virqfd=y
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/b33d2b4a9a4568ba67f6ed07e343e9eac0be2f7e

simplify build script and get virqfd=y
---

diff --git a/config.txt b/config.txt
index b0bda6e..f37d831 100644
--- a/config.txt
+++ b/config.txt
@@ -5705,7 +5705,7 @@ CONFIG_QCOM_GSBI=m
 CONFIG_ARM64_ERRATUM_1742098=y
 CONFIG_VIDEO_IVTV=m
 CONFIG_QEDF=m
-CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO_VIRQFD=y
 CONFIG_CARL9170_LEDS=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SCSI_BNX2_ISCSI=m
diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 9e9b90b..dc30fd4 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -26,9 +26,9 @@ build_linux()
         git fetch -a -t
         git reset --hard asahi-6.5-13
         cat ../../config.txt > .config
-        make LLVM=${CLANG_VERSION} rustavailable
-        make LLVM=${CLANG_VERSION} olddefconfig
-        make -j `nproc` LLVM=${CLANG_VERSION} V=0 bindeb-pkg > /dev/null
+        make LLVM=-15 rustavailable
+        make LLVM=-15 olddefconfig
+        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -90,12 +90,6 @@ EOF
 )
 }
 
-if type clang-15; then
-        export CLANG_VERSION=-15
-elif type clang-11; then
-        export CLANG_VERSION=-11
-fi
-
 mkdir -p build
 cd build