X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/92cbc56a55647917aabcd506c62292a3c26ca551..46ef70c57a4e7084e70200d2c333ef02c901eb44:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index e053003..99690d8 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,60 +1,90 @@
 #!/bin/bash
 
+# SPDX-License-Identifier: MIT
+
 set -x
 set -e
 
 unset LC_CTYPE
 unset LANG
 
+export DEBOOTSTRAP=debootstrap
+
+handle_crosscompile()
+{
+        if [ "`uname -m`" != 'aarch64' ]; then
+                export ARCH=arm64
+                export CROSS_COMPILE=aarch64-linux-gnu-
+                export DEBOOTSTRAP=qemu-debootstrap
+        fi
+}
+
+build_linux()
+{
+(
+        handle_crosscompile
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
+        cd linux
+        git fetch
+        git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
+        curl -s https://tg.st/u/5nly | git am -
+        curl -s https://tg.st/u/0wM8 | git am -
+        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
+        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+
+        # CPUFREQ patches
+        curl -s https://tg.st/u/0001-MAINTAINERS-apple-Add-apple-mcc-and-clk-apple-cluste.patch | git am -
+        curl -s https://tg.st/u/0002-dt-bindings-memory-controller-Add-apple-mcc-binding.patch | git am -
+        curl -s https://tg.st/u/0003-dt-bindings-clock-Add-apple-cluster-clk-binding.patch | git am -
+        curl -s https://tg.st/u/0004-opp-core-Don-t-warn-if-required-OPP-device-does-not-.patch | git am -
+        curl -s https://tg.st/u/0005-PM-domains-Add-of_genpd_add_provider_simple_noclk.patch | git am -
+        curl -s https://tg.st/u/0006-memory-apple-Add-apple-mcc-driver-to-manage-MCC-perf.patch | git am -
+        curl -s https://tg.st/u/0007-clk-apple-Add-clk-apple-cluster-driver-to-manage-CPU.patch | git am -
+        curl -s https://tg.st/u/0008-arm64-apple-Select-MEMORY-and-APPLE_MCC.patch | git am -
+        curl -s https://tg.st/u/0009-arm64-apple-Add-CPU-frequency-scaling-support-for-t8.patch | git am -
+
+        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
+
+        make olddefconfig
+        make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
+)
+}
+
 build_m1n1()
 {
 (
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch
-        git reset --hard origin/main; git clean -f -x -d
-        make -j 16
+        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        make -j $(( 2* `nproc`))
 )
 }
 
 build_uboot()
 {
 (
-        # Build u-boot
-        test -d u-boot || git clone https://github.com/kettenis/u-boot
+        handle_crosscompile
+        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
         cd u-boot
         git fetch
-        git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
+        git reset --hard origin/x2r10g10b10; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/v2-console-usb-kbd-Limit-poll-frequency-to-improve-performance.diff | patch -p1
         make apple_m1_defconfig
-        # it is normal that it runs on an error at the end
-        make -j 16 || true
+        make -j $(( 2* `nproc`))
 )
 
-        cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
-        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
-}
-
-build_linux()
-{
-(
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
-        cd linux
-        git fetch
-        git reset --hard origin/asahi; git clean -f -x -d
-        curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
-        curl -s https://tg.st/u/5nly | git am -
-        curl -s https://tg.st/u/0wM8 | git am -
-        curl -s https://tg.st/u/config-2022-01-28 > .config
-        make olddefconfig
-        make -j 16 bindeb-pkg
-)
+        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
 build_rootfs()
 {
 (
+        handle_crosscompile
         sudo rm -rf testing
-        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
+        sudo eatmydata ${DEBOOTSTRAP} --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -73,7 +103,7 @@ build_rootfs()
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
-        sudo bash -c 'chroot . apt install -y firmware-linux-free'
+        sudo bash -c 'chroot . apt install -y firmware-linux'
 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 
@@ -144,7 +174,6 @@ upload()
         curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
 }
 
-
 upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
@@ -155,9 +184,11 @@ upload_artefacts()
 mkdir -p build
 cd build
 
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support
+
+build_linux
 build_m1n1
 build_uboot
-build_linux
 build_rootfs
 build_live_stick
 build_di_stick