From 058fee544483cc8e607bdc46f4684a7a73db12ae Mon Sep 17 00:00:00 2001
From: Anupam Basak <anupam.basak27@gmail.com>
Date: Tue, 4 Jun 2024 17:14:46 +0530
Subject: [PATCH] Use existing firmware zip temporarily

---
 .gitlab-ci.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef67bd0..62ee39c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,10 +39,20 @@ build-zynthbox-image-armhf:
     - sudo mount --bind /dev/pts $mountdir/dev/pts
     - sudo mount --bind /proc $mountdir/proc
     - sudo mount --bind /sys $mountdir/sys
-    - echo "# Cleaning up old and unused kernels"
-    - sudo chroot $mountdir apt -yy remove "linux-headers-6.6.2*" "linux-image-6.6.2*" "linux-headers-rpi-v*" "linux-image-rpi-v*" "linux-kbuild-6.6.2*"
-    - echo "# Updating firmware and bootloader"
-    - sudo SKIP_WARNING=1 SKIP_BACKUP=1 ROOT_PATH=$mountdir BOOT_PATH=$mountdir/boot WANT_32BIT=1 WANT_64BIT=0 WANT_PI4=0 WANT_PI5=1 rpi-update
+    - |
+      set -x
+      cat << EOF | sudo chroot $mountdir
+      cd /boot
+      rm -rf ./*
+      wget https://www.opencode.net/zynthbox/zynthbox-image-builder/uploads/e931a08344279d8130cb18faf66a95cd/rpi5-miko-firmware.zip
+      unzip rpi5-miko-firmware.zip
+      rm rpi5-miko-firmware.zip
+      ls -al ./
+      EOF
+    # - echo "# Cleaning up old and unused kernels"
+    # - sudo chroot $mountdir apt -yy remove "linux-headers-6.6.2*" "linux-image-6.6.2*" "linux-headers-rpi-v*" "linux-image-rpi-v*" "linux-kbuild-6.6.2*"
+    # - echo "# Updating firmware and bootloader"
+    # - sudo SKIP_WARNING=1 SKIP_BACKUP=1 ROOT_PATH=$mountdir BOOT_PATH=$mountdir/boot WANT_32BIT=1 WANT_64BIT=0 WANT_PI4=0 WANT_PI5=1 rpi-update
     # - echo "# Installing kernel ${KERN}"
     # - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-headers-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
     # - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-image-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
@@ -110,7 +120,7 @@ build-zynthbox-image-armhf:
       git clone https://github.com/zynthbox/zyncoder.git -b dev-rpi5-libgpiod
       mkdir -p zyncoder/build
       cd zyncoder/build
-      ZYNTHIAN_WIRING_LAYOUT="Z2_V2" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+      ZYNTHIAN_WIRING_LAYOUT="Z2_V3" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
       make -j4 install
       EOF
     - sudo chroot $mountdir apt -y clean
-- 
GitLab