more pieces in progress

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index c188a14d2d299c520f7ff699baab3629eb8446e3..20b1c13648cb4abf77b6113bbbe905cf73e70e29 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

+# SPDX-License-Identifier: MIT
+

 set -x
 set -e
 
 set -x
 set -e
 


@@ -25,25 +27,28 @@ build_uboot()
         cd u-boot
         git fetch
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
         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

         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
         make -j 16 || true
 )
 
         cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
         make -j 16 || true
 )
 
         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()
 {
 (
 }
 
 build_linux()
 {
 (

-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work

         cd linux
         git fetch
         cd linux
         git fetch

-        git reset --hard origin/asahi; git clean -f -x -d
+        git reset --hard 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 -

-        curl -s https://tg.st/u/config-2022-01-28 > .config
+        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config

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


@@ -148,7 +153,7 @@ upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb

-        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin di-stick/vmlinuz k.deb
+        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb

 }
 
 mkdir -p build
 }
 
 mkdir -p build