working on bootstrap

diff --git a/bootstrap.sh b/bootstrap.sh
index 0bb00d4858d48831dc93ad7bee431b3b72c22ac6..775ac1077d1dbb914fa80b2cbe43e584fe7f9372 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -12,7 +12,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch

-        git reset --hard origin/master; git clean -f -x -d
+        git reset --hard origin/main; git clean -f -x -d

         make -j
 )
 }
         make -j
 )
 }


@@ -21,12 +21,12 @@ 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 https://github.com/kettenis/u-boot

         cd u-boot
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
         cd u-boot
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end

-        make || true
+        make -j 16 || true

 )
 
         cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 )
 
         cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho


@@ -49,4 +49,5 @@ build_uboot()
 # make olddefconfig
 # make bindeb-pkg
 
 # make olddefconfig
 # make bindeb-pkg
 

-build_m1n1
+# build_m1n1
+build_uboot