Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index 3f93d582697bb7ae3079a0a6700e0859d3f5ec2e..f5a5aa7c5f59a0ae06c161bdb8d8a8b736f35a6c 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +29,7 @@ build_linux()
         git fetch -a -t
         git reset --hard asahi-6.0-rc6-1; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-        cat ../../config-16k.txt > .config
+        cat ../../config > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -211,6 +211,9 @@ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu l
 build_linux
 build_m1n1
 build_uboot
+
+exit
+
 build_rootfs
 #build_di_stick
 build_dd

diff --git a/gpu.sh b/gpu.sh
new file mode 100644 (file)
index 0000000..c875e0c
--- /dev/null
+++ b/gpu.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: MIT
+
+set -x
+set -e
+
+unset LC_CTYPE
+unset LANG
+
+build_linux()
+{
+(
+        test -d linux || git clone https://github.com/AsahiLinux/linux
+        cd linux
+        git fetch -a -t
+        git reset --hard origin/asahi-wip;
+        curl -sL https://tg.st/u/e633ae8c7e2f16d7bc845a0695e583a836d94846e1c33da182216e565c3769c4.config > .config
+        make olddefconfig
+        make -j `nproc` V=0 > /dev/null
+        sudo make modules_install
+        sudo make install
+)
+}
+
+build_m1n1()
+{
+(
+        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
+        cd m1n1
+        git fetch -a -t
+        git reset --hard origin/lina/gpu-wip;
+        make -j `nproc`
+)
+}
+
+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;
+        curl -s https://tg.st/u/0001-usb-request-on-8-bytes-for-USB_SPEED_FULL-bMaxPacket.patch | git am -
+        make apple_m1_defconfig
+        make -j `nproc`
+)
+        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
+        sudo cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
+        sudo cp u-boot.bin /boot/efi/m1n1/boot.bin
+}
+
+mkdir -p build
+cd build
+
+build_linux
+build_m1n1
+build_uboot

diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index 5768342cbac1b8fd5121540e314739c7330aa0fb..6b4c7014fb8fc8df1c1f602e753168f83d0742bb 100644 (file)
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -68,6 +68,7 @@ my %asahi_options = (
         'CONFIG_USB_XHCI_PCI_ASMEDIA' => 'y',
         'CONFIG_APPLE_M1_CPU_PMU' => 'y',
         'CONFIG_SND_SOC_CS42L83' => 'm',
+        'CONFIG_DRM_APPLE' => 'y',
 );
 
 my %debian_options;