install to be chainloaded u-boot.bin

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 2237aff3387ef342523483b8b9cab250caac9afd..2c5d1e920864a52274b53f710dbe6d4634f4bb18 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -52,8 +52,7 @@ build_uboot()
         test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch
-        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
+        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -155,10 +154,15 @@ EOF
 
 build_asahi_installer_image()
 {
-        rm -rf esp
-        mkdir esp
-        mv EFI esp/
-        zip -r9 debian-base.zip esp media
+(
+        rm -rf aii
+        mkdir -p aii/esp aii/m1n1
+        cp -a EFI aii/esp/
+        cp u-boot.bin aii/m1n1/boot.bin
+        ln media aii/media
+        cd aii
+        zip -r9 ../debian-base.zip esp m1n1 media
+)
 }
 
 build_di_stick()