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

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 632f74e569744fbb905ae5c721741cd218421030..1b7af232ef2734e66f5a235fc3532e7a17375e69 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,10 +23,11 @@ build_uboot()
 {
 (
         # Build u-boot
 {
 (
         # Build u-boot

-        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot
+        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/x2r10g10b10; git clean -f -x -d
         cd u-boot
         git fetch
         git reset --hard origin/x2r10g10b10; git clean -f -x -d

+        curl -s https://tg.st/u/v2-console-usb-kbd-Limit-poll-frequency-to-improve-performance.diff | patch -p1

         make apple_m1_defconfig
         make -j 16
 )
         make apple_m1_defconfig
         make -j 16
 )


@@ -41,7 +42,7 @@ build_linux()
         test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
         cd linux
         git fetch
         test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
         cd linux
         git fetch

-        git reset --hard smc/work; git clean -f -x -d
+        git reset --hard origin/smc/work; 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/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
         curl -s https://tg.st/u/5nly | git am -
         curl -s https://tg.st/u/0wM8 | git am -