more kernel config options

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index dc30fd4985b176ce84874e7e01314403b00c1046..9ae38efc6b0e3df8f314a73c79828e7c5ff620b9 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,7 +16,8 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
-export M1N1_VERSION=1.4.2
+export M1N1_VERSION=1.4.6
+export KERNEL_VERSION=asahi-6.5-26
 
 build_linux()
 {
@@ -24,7 +25,8 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.5-13
+        git reset --hard $KERNEL_VERSION
+        git clean -f -x -d > /dev/null
         cat ../../config.txt > .config
         make LLVM=-15 rustavailable
         make LLVM=-15 olddefconfig
@@ -38,7 +40,8 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v{M1N1_VERSION};
+        git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null
         make -j `nproc`
 )
 }
@@ -49,7 +52,8 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard asahi-v2023.07.02-2;
+        git reset --hard asahi-v2023.07.02-3
+        git clean -f -x -d > /dev/null
 
         make apple_m1_defconfig
         make -j `nproc`