fix kernel reset

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 20b1c13648cb4abf77b6113bbbe905cf73e70e29..768fb5f4cd6e01a213b31a2e7e09c7be8c0a87a2 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,19 +23,16 @@ build_uboot()
 {
 (
         # Build u-boot
 {
 (
         # Build u-boot

-        test -d u-boot || git clone https://github.com/kettenis/u-boot
+        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10

         cd u-boot
         git fetch
         cd u-boot
         git fetch

-        git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
-        cp ../linux/arch/arm64/boot/dts/apple/t8103.dtsi arch/arm/dts/t8103.dtsi
-        cp ../linux/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi arch/arm/dts/t8103-jxxx.dtsi
+        git reset --hard origin/x2r10g10b10; git clean -f -x -d

         make apple_m1_defconfig
         make apple_m1_defconfig

-        # it is normal that it runs on an error at the end
-        make -j 16 || true
+        make -j 16

 )
 
 )
 

-        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
+        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_linux()
 }
 
 build_linux()


@@ -44,11 +41,14 @@ 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/m1-config-smc-2022-02-06 > .config
         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/m1-config-smc-2022-02-06 > .config

+        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
+        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+

         make olddefconfig
         make -j 16 bindeb-pkg
 )
         make olddefconfig
         make -j 16 bindeb-pkg
 )