From c75afca2c00f9d542621db7a2024699036185b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAben=20Carneiro?=
 <40370995+rubencarneiro@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:11:39 +0000
Subject: [PATCH 01/16] Add OnePlus Nord N10/N100 and Lenovo Tab M10 HD 2nd Gen
 Wifi

- Add Lenovo Tab M10 HD 2nd Gen Wifi (amar_row_wifi)
- Add OnePlus Nord N10 (billie)
- Add OnePlus Nord N100 (billie2)
---
 v2/devices/amar_row_wifi.yml | 188 ++++++++++++++++++++++++++++++++
 v2/devices/billie.yml        | 202 +++++++++++++++++++++++++++++++++++
 v2/devices/billie2.yml       | 202 +++++++++++++++++++++++++++++++++++
 3 files changed, 592 insertions(+)
 create mode 100644 v2/devices/amar_row_wifi.yml
 create mode 100644 v2/devices/billie.yml
 create mode 100644 v2/devices/billie2.yml

diff --git a/v2/devices/amar_row_wifi.yml b/v2/devices/amar_row_wifi.yml
new file mode 100644
index 00000000..4763aeff
--- /dev/null
+++ b/v2/devices/amar_row_wifi.yml
@@ -0,0 +1,188 @@
+name: "Lenovo Tab M10 HD 2nd Gen Wifi"
+codename: "amar_row_wifi"
+formfactor: "tablet"
+aliases: [amar_row_wifi, X306F]
+doppelgangers: []
+user_actions:
+  confirm_model:
+    title: "Confirm your model"
+    description: "Please check that your device is a Lenovo Tab M10 HD Wifi (X306F)."
+  confirm_os:
+    title: "Confirm OS version"
+    description: "Your device must be running the Android 11 stock firmware before installing Ubuntu Touch. You can flash the device using spflash tools"
+    link: "https://github.com/rubencarneiro/amar_row_wifi/releases/download/1.0/Firmware.tar.xz"
+  unlock_phone:
+    title: "Unlock the bootloader"
+    description: "Before installing Ubuntu Touch you must unlock the bootloader of your phone manually. Follow the steps in the linked page if you haven't already."
+    link: "https://unlocktechy.com/lenovo-tab-m10-hd-gen-2-unlock-bootloader"
+  bootloader:
+    title: "Reboot to Bootloader"
+    description: "With the device powered off, press and hold the VOLUME DOWN + POWER until you see the fastboot on screen and plug the device into your PC via USB."
+    image: "phone_power_down"
+    button: true
+  bootloader_from_fastbootd:
+    title: "Reboot to Bootloader"
+    description: 'With the device still at the fastbootd screen, use the volume buttons to select "Reboot to bootloader".'
+    image: "phone_power_down"
+    button: true
+  recovery:
+    title: "Reboot to Recovery"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection.'
+    image: "phone_power_up"
+    button: true
+  fastbootd:
+    title: "Reboot to fastbootd mode"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection. Then select "Fastboot mode" from the list.'
+    image: "phone_power_up"
+    button: true
+unlock:
+  - "confirm_model"
+  - "confirm_os"
+  - "unlock_phone"
+operating_systems:
+  - name: "Ubuntu Touch"
+    compatible_installer: ">=0.9.6-beta"
+    options:
+      - var: "channel"
+        name: "Channel"
+        tooltip: "The release channel"
+        link: "https://docs.ubports.com/en/latest/about/process/release-schedule.html"
+        type: "select"
+        remote_values:
+          systemimage:channels:
+      - var: "wipe"
+        name: "Wipe Userdata"
+        tooltip: "Wipe personal data. This is necessary for first time installations."
+        type: "checkbox"
+      - var: "partition"
+        name: "Partitioning"
+        tooltip: "Changes partition sizes as required. Only necessary for first time installations."
+        type: "checkbox"
+        value: true
+      - var: "bootstrap"
+        name: "Bootstrap"
+        tooltip: "Flash system partitions using fastboot"
+        type: "checkbox"
+        value: true
+    prerequisites: []
+    steps:
+      ### Ensure we always start in bootloader mode
+      - actions:
+          - adb:reboot:
+              to_state: "bootloader"
+        fallback:
+          - core:user_action:
+              action: "bootloader"
+      ### Ensure the bootloader has been unlocked already
+      - actions:
+          - fastboot:wait:
+      - actions:
+          - fastboot:assert_var:
+              variable: "unlocked"
+              value: "yes"
+        fallback:
+          - core:user_action:
+              action: "unlock_phone"
+      ### Flash important partitions (if requested)
+      - actions:
+          - core:download:
+              group: "firmware"
+              files:
+                - url: "https://github.com/rubencarneiro/amar_row_wifi/releases/download/1.0/boot.img"
+                  checksum:
+                    sum: "d2410a0a730ceeeef19d30773dabe118c818af006c3c52e960b3aeee87cfa9c5"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/amar_row_wifi/releases/download/1.0/recovery.img"
+                  checksum:
+                    sum: "582afc66f61b9060e936638bf347eccc8eca81e5c6014e4b79e2f33835648902"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/amar_row_wifi/releases/download/1.0/dtbo.img"
+                  checksum:
+                    sum: "41bef15140c81d701ea0ff0bf9e0cd293c2419d12606d930496ae551c1e8e716"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/amar_row_wifi/releases/download/1.0/vbmeta.img"
+                  checksum:
+                    sum: "debc86fc6832bbc8f76cbeca2319a8768c03c19ac8d67dca61bf414b52ba2fb9"
+                    algorithm: "sha256"       
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - fastboot:flash:
+              partitions:
+                - partition: "boot"
+                  file: "boot.img"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "recovery.img"
+                  group: "firmware"
+                - partition: "dtbo"
+                  file: "dtbo.img"
+                  group: "firmware"
+                - partition: "vbmeta"
+                  file: "vbmeta.img"
+                  group: "firmware"
+                  flags:
+                    - "--disable-verity" 
+                    - "--disable-verification"
+        condition:
+          var: "bootstrap"
+          value: true
+      ### Set up logical partitions (if requested)
+      - actions:
+          - fastboot:reboot_fastboot:
+        fallback:
+          - core:user_action:
+              action: "fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          # Remove all unused logical partitions
+          - fastboot:delete_logical_partition:
+              partition: "product"
+          # Increase space for system_a for UT installation
+          - fastboot:resize_logical_partition:
+              partition: "system"
+              size: 3978565472
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          - fastboot:reboot_bootloader:
+        fallback:
+          - core:user_action:
+              action: "bootloader_from_fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      ### Wipe userdata (if requested)
+      - actions:
+          - fastboot:erase:
+              partition: "userdata"
+        condition:
+          var: "wipe"
+          value: true
+      - actions:
+          - fastboot:format:
+              partition: "userdata"
+              type: "ext4"
+        condition:
+          var: "wipe"
+          value: true
+      ### Systemimage installation steps
+      - actions:
+          - fastboot:reboot_recovery:
+        fallback:
+          - core:user_action:
+              action: "recovery"
+      - actions:
+          - systemimage:install:
+              verify_recovery: true
+      - actions:
+          - adb:reboot:
+              to_state: "recovery"
+        fallback:
+          - core:user_action:
+              action: "recovery"
+    slideshow: []
diff --git a/v2/devices/billie.yml b/v2/devices/billie.yml
new file mode 100644
index 00000000..1a83cbfc
--- /dev/null
+++ b/v2/devices/billie.yml
@@ -0,0 +1,202 @@
+name: "OnePlus Nord N10 5G"
+codename: "billie"
+formfactor: "phone"
+aliases: [OnePlusN10]
+doppelgangers: []
+user_actions:
+  confirm_model:
+    title: "Confirm your model"
+    description: "Please check that your device is a OnePlus N10 5G (billie)."
+  confirm_os:
+    title: "Confirm OS version"
+    description: "Your device must be running the Android 10 stock firmware OxygenOS_10.5.7 before installing Ubuntu Touch.If you are using Global Version use the OxygenOS_10.5.7 for global."
+    link: "https://onepluscommunityserver.com/list/Unbrick_Tools/OnePlus_Nord_N10_5G/EU_BE89BA/Q/OnePlus_Nord_N10_5G_EU_OxygenOS_10.5.7.zip"
+  unlock_phone:
+    title: "Unlock the bootloader"
+    description: "Before installing Ubuntu Touch you must unlock the bootloader of your phone manually. Follow the steps in the linked page if you haven't already."
+    link: "https://community.oneplus.com/thread/64487"
+  bootloader:
+    title: "Reboot to Bootloader"
+    description: "With the device powered off, press and hold the VOLUME DOWN button and plug the device into your PC via USB. After some seconds you'll see the fastboot mode."
+    image: "phone_power_down"
+    button: true
+  bootloader_from_fastbootd:
+    title: "Reboot to Bootloader"
+    description: 'With the device still at the fastbootd screen, use the volume buttons to select "Reboot to bootloader".'
+    image: "phone_power_down"
+    button: true
+  recovery:
+    title: "Reboot to Recovery"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection.'
+    image: "phone_power_up"
+    button: true
+  fastbootd:
+    title: "Reboot to fastbootd mode"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection. Then select "Fastboot mode" from the list.'
+    image: "phone_power_up"
+    button: true
+unlock:
+  - "confirm_model"
+  - "confirm_os"
+  - "unlock_phone"
+operating_systems:
+  - name: "Ubuntu Touch"
+    compatible_installer: ">=0.9.6-beta"
+    options:
+      - var: "channel"
+        name: "Channel"
+        tooltip: "The release channel"
+        link: "https://docs.ubports.com/en/latest/about/process/release-schedule.html"
+        type: "select"
+        remote_values:
+          systemimage:channels:
+      - var: "wipe"
+        name: "Wipe Userdata"
+        tooltip: "Wipe personal data. This is necessary for first time installations."
+        type: "checkbox"
+      - var: "partition"
+        name: "Partitioning"
+        tooltip: "Changes partition sizes as required. Only necessary for first time installations."
+        type: "checkbox"
+        value: true
+      - var: "bootstrap"
+        name: "Bootstrap"
+        tooltip: "Flash system partitions using fastboot"
+        type: "checkbox"
+        value: true
+    prerequisites: []
+    steps:
+      ### Ensure we always start in bootloader mode
+      - actions:
+          - adb:reboot:
+              to_state: "bootloader"
+        fallback:
+          - core:user_action:
+              action: "bootloader"
+      ### Ensure the bootloader has been unlocked already
+      - actions:
+          - fastboot:wait:
+      - actions:
+          - fastboot:assert_var:
+              variable: "unlocked"
+              value: "yes"
+        fallback:
+          - core:user_action:
+              action: "unlock_phone"
+          ### As this is an A/B device, force all future operations in "a" slot.
+      - actions:
+          - fastboot:set_active:
+              slot: "a"
+      ### Flash important partitions (if requested)
+      - actions:
+          - core:download:
+              group: "firmware"
+              files:
+                - url: "https://github.com/rubencarneiro/billie/releases/download/1.0/boot.img"
+                  checksum:
+                    sum: "65e9ad9b1e879d123a1de6482556feb1703710897fe67f1de8abf1c3a33337df"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie/releases/download/1.0/recovery.img"
+                  checksum:
+                    sum: "d5d985ffdc93720d6f5702006a9dc488bd8f62f854347a6b6e08eef83832d5d4"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie/releases/download/1.0/dtbo.img"
+                  checksum:
+                    sum: "984f270a8edf8c8f8be10215e07a030dc9cd822929df6f1ff7c4a9b4ad897b05"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie/releases/download/1.0/vbmeta.img"
+                  checksum:
+                    sum: "4f1b180cc3a485c4eb2d996010ef5a2bc307bba0178bfa5411c6fa7220819d83"
+                    algorithm: "sha256"       
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - fastboot:flash:
+              partitions:
+                - partition: "boot"
+                  file: "boot.img"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "recovery.img"
+                  group: "firmware"
+                - partition: "dtbo"
+                  file: "dtbo.img"
+                  group: "firmware"
+                - partition: "vbmeta"
+                  file: "vbmeta.img"
+                  group: "firmware"
+        condition:
+          var: "bootstrap"
+          value: true
+      ### Set up logical partitions (if requested)
+      - actions:
+          - fastboot:reboot_fastboot:
+        fallback:
+          - core:user_action:
+              action: "fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          # Remove all unused logical partitions
+          - fastboot:delete_logical_partition:
+              partition: "system_ext_a"
+          - fastboot:delete_logical_partition:
+              partition: "system_ext_b"
+          - fastboot:delete_logical_partition:
+              partition: "product_a"
+          - fastboot:delete_logical_partition:
+              partition: "product_b"
+          # Remove _b variants of used partitions
+          - fastboot:delete_logical_partition:
+              partition: "system_b"
+          - fastboot:delete_logical_partition:
+              partition: "vendor_b"
+          - fastboot:delete_logical_partition:
+              partition: "odm_b"
+          # Increase space for system_a for UT installation
+          - fastboot:resize_logical_partition:
+              partition: "system_a"
+              size: 3221225472
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          - fastboot:reboot_bootloader:
+        fallback:
+          - core:user_action:
+              action: "bootloader_from_fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      ### Wipe userdata (if requested)
+      - actions:
+          - fastboot:erase:
+              partition: "userdata"
+        condition:
+          var: "wipe"
+          value: true
+      - actions:
+          - fastboot:format:
+              partition: "userdata"
+              type: "ext4"
+        condition:
+          var: "wipe"
+          value: true
+      ### Systemimage installation steps
+      - actions:
+          - fastboot:reboot_recovery:
+        fallback:
+          - core:user_action:
+              action: "recovery"
+      - actions:
+          - systemimage:install:
+              verify_recovery: true
+      - actions:
+          - adb:reboot:
+              to_state: "recovery"
+        fallback:
+          - core:user_action:
+              action: "recovery"
+    slideshow: []
diff --git a/v2/devices/billie2.yml b/v2/devices/billie2.yml
new file mode 100644
index 00000000..8abf4f84
--- /dev/null
+++ b/v2/devices/billie2.yml
@@ -0,0 +1,202 @@
+name: "OnePlus Nord N100"
+codename: "billie2"
+formfactor: "phone"
+aliases: [OnePlusN100]
+doppelgangers: []
+user_actions:
+  confirm_model:
+    title: "Confirm your model"
+    description: "Please check that your device is a OnePlus N100 (billie2)."
+  confirm_os:
+    title: "Confirm OS version"
+    description: "Your device must be running the Android 10 stock firmware OxygenOS_10.5.2 if is EU version before installing, or OxygenOS_10.5.3 if is Global Version  Ubuntu Touch."
+    link: "https://onepluscommunityserver.com/list/Unbrick_Tools/OnePlus_Nord_N100/EU_BE83BA/Q/OnePlus_Nord_N100_EU_OxygenOS_10.5.2.zip or https://onepluscommunityserver.com/list/Unbrick_Tools/OnePlus_Nord_N100/Global_BE81AA/Q/OnePlus_Nord_N100_Global_OxygenOS_10.5.3.zip"
+  unlock_phone:
+    title: "Unlock the bootloader"
+    description: "Before installing Ubuntu Touch you must unlock the bootloader of your phone manually. Follow the steps in the linked page if you haven't already."
+    link: "https://community.oneplus.com/thread/64487"
+  bootloader:
+    title: "Reboot to Bootloader"
+    description: "With the device powered off, press and hold the VOLUME UP button and plug the device into your PC via USB. After some seconds you'll see the fastboot mode."
+    image: "phone_power_down"
+    button: true
+  bootloader_from_fastbootd:
+    title: "Reboot to Bootloader"
+    description: 'With the device still at the fastbootd screen, use the volume buttons to select "Reboot to bootloader".'
+    image: "phone_power_down"
+    button: true
+  recovery:
+    title: "Reboot to Recovery"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection.'
+    image: "phone_power_up"
+    button: true
+  fastbootd:
+    title: "Reboot to fastbootd mode"
+    description: 'With the device still at the "FastBoot Mode", use the Volume buttons to switch to "Recovery Mode" and push the power button to confirm your selection. Then select "Fastboot mode" from the list.'
+    image: "phone_power_up"
+    button: true
+unlock:
+  - "confirm_model"
+  - "confirm_os"
+  - "unlock_phone"
+operating_systems:
+  - name: "Ubuntu Touch"
+    compatible_installer: ">=0.9.6-beta"
+    options:
+      - var: "channel"
+        name: "Channel"
+        tooltip: "The release channel"
+        link: "https://docs.ubports.com/en/latest/about/process/release-schedule.html"
+        type: "select"
+        remote_values:
+          systemimage:channels:
+      - var: "wipe"
+        name: "Wipe Userdata"
+        tooltip: "Wipe personal data. This is necessary for first time installations."
+        type: "checkbox"
+      - var: "partition"
+        name: "Partitioning"
+        tooltip: "Changes partition sizes as required. Only necessary for first time installations."
+        type: "checkbox"
+        value: true
+      - var: "bootstrap"
+        name: "Bootstrap"
+        tooltip: "Flash system partitions using fastboot"
+        type: "checkbox"
+        value: true
+    prerequisites: []
+    steps:
+      ### Ensure we always start in bootloader mode
+      - actions:
+          - adb:reboot:
+              to_state: "bootloader"
+        fallback:
+          - core:user_action:
+              action: "bootloader"
+      ### Ensure the bootloader has been unlocked already
+      - actions:
+          - fastboot:wait:
+      - actions:
+          - fastboot:assert_var:
+              variable: "unlocked"
+              value: "yes"
+        fallback:
+          - core:user_action:
+              action: "unlock_phone"
+          ### As this is an A/B device, force all future operations in "a" slot.
+      - actions:
+          - fastboot:set_active:
+              slot: "a"
+      ### Flash important partitions (if requested)
+      - actions:
+          - core:download:
+              group: "firmware"
+              files:
+                - url: "https://github.com/rubencarneiro/billie2/releases/download/1.0/boot.img"
+                  checksum:
+                    sum: "9558a382154ecccbf0fcac75dd13f4865523158d86e347b05a46511139dedaab"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie2/releases/download/1.0/recovery.img"
+                  checksum:
+                    sum: "fa249bf4d71fcc135456af90ca4e8d8175e3d10dbc5053792a0cf5ba14114d29"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie2/releases/download/1.0/dtbo.img"
+                  checksum:
+                    sum: "47eac9731ffbdea4373acb60eeb30837642d3e69773a65f71125b304390225dc"
+                    algorithm: "sha256"
+                - url: "https://github.com/rubencarneiro/billie2/releases/download/1.0/vbmeta.img"
+                  checksum:
+                    sum: "06ad2b775ec21134aa935eb6e0a48514198822ee7bfb1773f27cc006a0c6e427"
+                    algorithm: "sha256"       
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - fastboot:flash:
+              partitions:
+                - partition: "boot"
+                  file: "boot.img"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "recovery.img"
+                  group: "firmware"
+                - partition: "dtbo"
+                  file: "dtbo.img"
+                  group: "firmware"
+                - partition: "vbmeta"
+                  file: "vbmeta.img"
+                  group: "firmware"
+        condition:
+          var: "bootstrap"
+          value: true
+      ### Set up logical partitions (if requested)
+      - actions:
+          - fastboot:reboot_fastboot:
+        fallback:
+          - core:user_action:
+              action: "fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          # Remove all unused logical partitions
+          - fastboot:delete_logical_partition:
+              partition: "system_ext_a"
+          - fastboot:delete_logical_partition:
+              partition: "system_ext_b"
+          - fastboot:delete_logical_partition:
+              partition: "product_a"
+          - fastboot:delete_logical_partition:
+              partition: "product_b"
+          # Remove _b variants of used partitions
+          - fastboot:delete_logical_partition:
+              partition: "system_b"
+          - fastboot:delete_logical_partition:
+              partition: "vendor_b"
+          - fastboot:delete_logical_partition:
+              partition: "odm_b"
+          # Increase space for system_a for UT installation
+          - fastboot:resize_logical_partition:
+              partition: "system_a"
+              size: 3221225472
+        condition:
+          var: "partition"
+          value: true
+      - actions:
+          - fastboot:reboot_bootloader:
+        fallback:
+          - core:user_action:
+              action: "bootloader_from_fastbootd"
+        condition:
+          var: "partition"
+          value: true
+      ### Wipe userdata (if requested)
+      - actions:
+          - fastboot:erase:
+              partition: "userdata"
+        condition:
+          var: "wipe"
+          value: true
+      - actions:
+          - fastboot:format:
+              partition: "userdata"
+              type: "ext4"
+        condition:
+          var: "wipe"
+          value: true
+      ### Systemimage installation steps
+      - actions:
+          - fastboot:reboot_recovery:
+        fallback:
+          - core:user_action:
+              action: "recovery"
+      - actions:
+          - systemimage:install:
+              verify_recovery: true
+      - actions:
+          - adb:reboot:
+              to_state: "recovery"
+        fallback:
+          - core:user_action:
+              action: "recovery"
+    slideshow: []

From a00343d55eb53e195475f0c771a98f4616a591a9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 13 Mar 2024 10:41:52 +0200
Subject: [PATCH 02/16] vidofnir: sort flashed VollaOS partitions
 alphabetically

---
 v2/devices/vidofnir.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/v2/devices/vidofnir.yml b/v2/devices/vidofnir.yml
index 23981e9b..0c0a2358 100644
--- a/v2/devices/vidofnir.yml
+++ b/v2/devices/vidofnir.yml
@@ -139,6 +139,7 @@ operating_systems:
           - core:user_action:
               action: "recovery"
     slideshow: []
+
   - name: "Volla OS"
     compatible_installer: ">=0.9.2-beta"
     prerequisites: []
@@ -172,15 +173,15 @@ operating_systems:
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "unpacked/logo.bin"
                   group: "firmware"
                 - partition: "md1img"
                   file: "unpacked/md1img.img"
                   group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk.img"
-                  group: "firmware"
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"

From ec0d1608561532960594506f3f852cdcf626c30d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 13 Mar 2024 10:42:32 +0200
Subject: [PATCH 03/16] vidofnir: update VollaOS to 12.1-20240228

Seems to fix flashing back from UT at least.
---
 v2/devices/vidofnir.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2/devices/vidofnir.yml b/v2/devices/vidofnir.yml
index 0c0a2358..d2914441 100644
--- a/v2/devices/vidofnir.yml
+++ b/v2/devices/vidofnir.yml
@@ -148,15 +148,15 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20230911-stable-SPFLASH-vidofnir.zip"
+                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20240228-stable-SPFLASH-vidofnir.zip"
                   checksum:
-                    sum: "71840531706eda0633873d02eb181d3dc306178d8210ca05d612561958e55428"
+                    sum: "4ad9aa53980835bcefa379f1963e4e4dd71136b8e18f82b3397d586f406a66a0"
                     algorithm: "sha256"
       - actions:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-12.1-20230911-stable-SPFLASH-vidofnir.zip"
+                - archive: "volla-12.1-20240228-stable-SPFLASH-vidofnir.zip"
                   dir: "unpacked"
       - actions:
           - adb:reboot:

From 66ce64e7e82f8d6d7275683bfea25e9bed843b0e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 13 Mar 2024 10:43:20 +0200
Subject: [PATCH 04/16] vidofnir_esim: rename from vidofnir

This is the new codename for Volla X23 with upgraded firmware on UT
side which people will now migrate to automatically by simply searching
for updates.
---
 v2/devices/{vidofnir.yml => vidofnir_esim.yml} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename v2/devices/{vidofnir.yml => vidofnir_esim.yml} (99%)

diff --git a/v2/devices/vidofnir.yml b/v2/devices/vidofnir_esim.yml
similarity index 99%
rename from v2/devices/vidofnir.yml
rename to v2/devices/vidofnir_esim.yml
index d2914441..db7aafde 100644
--- a/v2/devices/vidofnir.yml
+++ b/v2/devices/vidofnir_esim.yml
@@ -1,7 +1,8 @@
 name: "Volla Phone X23"
-codename: "vidofnir"
+codename: "vidofnir_esim"
 formfactor: "phone"
-aliases: []
+aliases:
+  - "vidofnir"
 user_actions:
   recovery:
     title: "Reboot to Recovery"

From faaaacd71beddd82ca45a259efec98c6a79343c9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 25 Oct 2023 10:45:16 +0300
Subject: [PATCH 05/16] mimameid: sort flashed VollaOS partitions
 alphabetically

---
 v2/devices/mimameid.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index 26a59b01..3fa119a3 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -183,30 +183,30 @@ operating_systems:
                 - partition: "gz"
                   file: "unpacked/gz-verified.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk-verified.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "unpacked/logo-verified.bin"
                   group: "firmware"
                 - partition: "md1img"
                   file: "unpacked/md1img-verified.img"
                   group: "firmware"
+                - partition: "scp"
+                  file: "unpacked/scp-verified.img"
+                  group: "firmware"
                 - partition: "spmfw"
                   file: "unpacked/spmfw-verified.img"
                   group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk-verified.img"
-                  group: "firmware"
                 - partition: "sspm"
                   file: "unpacked/sspm-verified.img"
                   group: "firmware"
-                - partition: "scp"
-                  file: "unpacked/scp-verified.img"
+                - partition: "super"
+                  file: "unpacked/super.img"
                   group: "firmware"
                 - partition: "tee"
                   file: "unpacked/tee-verified.img"
                   group: "firmware"
-                - partition: "super"
-                  file: "unpacked/super.img"
-                  group: "firmware"
                 - partition: "vbmeta"
                   file: "unpacked/vbmeta.img"
                   group: "firmware"

From 2ce4b8bc3ca88b50b5fa91951cb0396ac2e31520 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 7 Mar 2024 12:58:45 +0200
Subject: [PATCH 06/16] mimameid: flash full Android 11 fw for UT and Droidian

This avoids soft-bricking the device for users coming from VollaOS 12+.
---
 v2/devices/mimameid.yml | 89 +++++++++++++++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 17 deletions(-)

diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index 3fa119a3..0e82d3d5 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -51,7 +51,7 @@ operating_systems:
         type: "checkbox"
       - var: "bootstrap"
         name: "Bootstrap"
-        tooltip: "Flash system partitions using fastboot"
+        tooltip: "Flash system partitions using fastboot. Do NOT uncheck unless you know exactly what you're doing!"
         type: "checkbox"
         value: true
     prerequisites: []
@@ -61,9 +61,9 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/volla-mimameid-11.0-ubports-installer-bootstrap-v2.zip"
+                - url: "https://volla.tech/filedump/volla-mimameid-11.0-ubports-installer-bootstrap-v3.zip"
                   checksum:
-                    sum: "82ec6dd3d5602ecdd5cd445e09440c6c764b841648c22317a59ca536c502323b"
+                    sum: "a1fb6b27e3f693c7155e6a64dfdc58d00198921ffe04040aac4a124a657acd05"
                     algorithm: "sha256"
         condition:
           var: "bootstrap"
@@ -72,7 +72,7 @@ operating_systems:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-mimameid-11.0-ubports-installer-bootstrap-v2.zip"
+                - archive: "volla-mimameid-11.0-ubports-installer-bootstrap-v3.zip"
                   dir: "unpacked"
         condition:
           var: "bootstrap"
@@ -95,19 +95,46 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
+                - partition: "boot_a"
+                  file: "unpacked/boot.img"
+                  group: "firmware"
+                - partition: "dtbo_a"
+                  file: "unpacked/dtbo.img"
+                  group: "firmware"
+                - partition: "gz_a"
+                  file: "unpacked/gz.img"
+                  group: "firmware"
                 - partition: "lk_a"
                   file: "unpacked/lk.img"
                   group: "firmware"
-                - partition: "boot_a"
-                  file: "unpacked/boot.img"
+                - partition: "logo"
+                  file: "unpacked/logo.img"
                   group: "firmware"
-                - partition: "vbmeta_a"
-                  file: "unpacked/vbmeta.img"
+                - partition: "md1img_a"
+                  file: "unpacked/md1img.img"
+                  group: "firmware"
+                - partition: "preloader_a"
+                  file: "unpacked/preloader.img"
+                  group: "firmware"
+                - partition: "scp_a"
+                  file: "unpacked/scp.img"
+                  group: "firmware"
+                - partition: "spmfw_a"
+                  file: "unpacked/spmfw.img"
+                  group: "firmware"
+                - partition: "sspm_a"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
-                  flags: ["--disable-verity"]
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"
+                - partition: "tee_a"
+                  file: "unpacked/tee.img"
+                  group: "firmware"
+                - partition: "vbmeta_a"
+                  file: "unpacked/vbmeta.img"
+                  group: "firmware"
+                  flags: ["--disable-verity"]
         condition:
           var: "bootstrap"
           value: true
@@ -246,7 +273,7 @@ operating_systems:
             label: "Cutie Shell"
       - var: "bootstrap"
         name: "Bootstrap"
-        tooltip: "Flash system partitions using fastboot"
+        tooltip: "Flash system partitions using fastboot. Do NOT uncheck unless you know exactly what you're doing!"
         type: "checkbox"
         value: true
     prerequisites: []
@@ -262,9 +289,9 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/volla-mimameid-11.0-ubports-installer-bootstrap-v2.zip"
+                - url: "https://volla.tech/filedump/volla-mimameid-11.0-ubports-installer-bootstrap-v3.zip"
                   checksum:
-                    sum: "82ec6dd3d5602ecdd5cd445e09440c6c764b841648c22317a59ca536c502323b"
+                    sum: "a1fb6b27e3f693c7155e6a64dfdc58d00198921ffe04040aac4a124a657acd05"
                     algorithm: "sha256"
         condition:
           var: "bootstrap"
@@ -284,7 +311,7 @@ operating_systems:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-mimameid-11.0-ubports-installer-bootstrap-v2.zip"
+                - archive: "volla-mimameid-11.0-ubports-installer-bootstrap-v3.zip"
                   dir: "unpacked"
         condition:
           var: "bootstrap"
@@ -326,18 +353,46 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
+                - partition: "boot_a"
+                  file: "twrp-mimameid.img"
+                  group: "firmware"
+                - partition: "dtbo_a"
+                  file: "unpacked/dtbo.img"
+                  group: "firmware"
+                - partition: "gz_a"
+                  file: "unpacked/gz.img"
+                  group: "firmware"
                 - partition: "lk_a"
                   file: "unpacked/lk.img"
                   group: "firmware"
-                - partition: "vbmeta_a"
-                  file: "unpacked/vbmeta.img"
+                - partition: "logo"
+                  file: "unpacked/logo.img"
                   group: "firmware"
-                - partition: "boot_a"
-                  file: "twrp-mimameid.img"
+                - partition: "md1img_a"
+                  file: "unpacked/md1img.img"
+                  group: "firmware"
+                - partition: "preloader_a"
+                  file: "unpacked/preloader.img"
+                  group: "firmware"
+                - partition: "scp_a"
+                  file: "unpacked/scp.img"
+                  group: "firmware"
+                - partition: "spmfw_a"
+                  file: "unpacked/spmfw.img"
+                  group: "firmware"
+                - partition: "sspm_a"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"
+                - partition: "tee_a"
+                  file: "unpacked/tee.img"
+                  group: "firmware"
+                - partition: "vbmeta_a"
+                  file: "unpacked/vbmeta.img"
+                  group: "firmware"
+                  flags: ["--disable-verity"]
         condition:
           var: "bootstrap"
           value: true

From 37bb37d7b2ac3d5a9ff6c141f73548246c4b77ae Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 11 Mar 2024 09:54:46 +0200
Subject: [PATCH 07/16] mimameid: rephrase TWRP sideload steps

Previously selecting 'Wipe Cache' caused a flashing issue, but wiping
'Dalvik Cache' does nothing so we might as well instruct users to not
touch it either.
---
 v2/devices/mimameid.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index 0e82d3d5..70971da2 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -23,7 +23,7 @@ user_actions:
     button: true
   twrp_sideload:
     title: "TWRP sideload"
-    description: 'Select "Advanced" and then "ADB Sideload". Check the box "Wipe Dalvik Cache" and then swipe the bar in the bottom where it says "Swipe to Start Sideload".'
+    description: 'Select "Advanced" and then "ADB Sideload". Do NOT check either of the wipe boxes, just swipe the bar on the bottom where it says "Swipe to Start Sideload".'
     button: true
   twrp_sideload_reboot:
     title: "Sideload complete!"

From e5631b7903c6bac711fab993357fdb27c03fcb67 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 11 Mar 2024 11:18:34 +0200
Subject: [PATCH 08/16] mimameid: add disclaimer about replaced displays with
 old fw

---
 v2/devices/mimameid.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index 70971da2..f95aac6e 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -17,6 +17,10 @@ user_actions:
     title: "Reboot the device"
     description: "Hold down the power button until the device powers down. Then, release it briefly and hold it down again until the device boots."
     button: true
+  display_notice:
+    title: "Replacement Display Notice"
+    description: "The selected OS requires Android 11 firmware which does NOT support Volla Phone 22 devices with replaced display panels. If that is the case or you're unsure, to avoid soft-bricking your phone please restart the process and instead select 'Volla Phone 22 with new display' as the device!"
+    button: true
   cutie_notice:
     title: "Cutie Shell: Notice"
     description: "You selected to install Droidian with Cutie Shell. Cutie Shell is still pre-alpha quality and it is not suitable for production environments. Keep in mind that Cutie Shell is not officially supported or endorsed by Droidian. This edition is maintained directly by Cutie Shell Community Project and you should report any bugs with these images at Cutie Shell Community Project before filing upstream."
@@ -56,6 +60,9 @@ operating_systems:
         value: true
     prerequisites: []
     steps:
+      - actions:
+          - core:user_action:
+              action: "display_notice"
       # Firmware setup (bootstrap)
       - actions:
           - core:download:
@@ -278,6 +285,9 @@ operating_systems:
         value: true
     prerequisites: []
     steps:
+      - actions:
+          - core:user_action:
+              action: "display_notice"
       - actions:
           - core:user_action:
               action: "cutie_notice"

From 2fac3ef304339b2ce24d9de118863c39781aca22 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 15 Dec 2023 17:45:14 +0200
Subject: [PATCH 09/16] mimameid: update VollaOS to 12.1-20240228

---
 v2/devices/mimameid.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index f95aac6e..3f523550 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -189,15 +189,15 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/vollaos/volla-11.1-20221017-stable-SPFLASH-mimameid.zip"
+                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20240228-stable-SPFLASH-mimameid.zip"
                   checksum:
-                    sum: "1021e15b932c0ca006f117c15259bba2e31b4d6ef1cc5218ea0d806c84cc6882"
+                    sum: "7038740f7efc183a54a0bb5816c9d10fa8c7a5ef0a95cc19a2565255b060954e"
                     algorithm: "sha256"
       - actions:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-11.1-20221017-stable-SPFLASH-mimameid.zip"
+                - archive: "volla-12.1-20240228-stable-SPFLASH-mimameid.zip"
                   dir: "unpacked"
       - actions:
           - adb:reboot:
@@ -215,31 +215,34 @@ operating_systems:
                   file: "unpacked/dtbo.img"
                   group: "firmware"
                 - partition: "gz"
-                  file: "unpacked/gz-verified.img"
+                  file: "unpacked/gz.img"
                   group: "firmware"
                 - partition: "lk"
-                  file: "unpacked/lk-verified.img"
+                  file: "unpacked/lk.img"
                   group: "firmware"
                 - partition: "logo"
-                  file: "unpacked/logo-verified.bin"
+                  file: "unpacked/logo.bin"
                   group: "firmware"
                 - partition: "md1img"
-                  file: "unpacked/md1img-verified.img"
+                  file: "unpacked/md1img.img"
+                  group: "firmware"
+                - partition: "preloader"
+                  file: "unpacked/preloader.img"
                   group: "firmware"
                 - partition: "scp"
-                  file: "unpacked/scp-verified.img"
+                  file: "unpacked/scp.img"
                   group: "firmware"
                 - partition: "spmfw"
-                  file: "unpacked/spmfw-verified.img"
+                  file: "unpacked/spmfw.img"
                   group: "firmware"
                 - partition: "sspm"
-                  file: "unpacked/sspm-verified.img"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"
                 - partition: "tee"
-                  file: "unpacked/tee-verified.img"
+                  file: "unpacked/tee.img"
                   group: "firmware"
                 - partition: "vbmeta"
                   file: "unpacked/vbmeta.img"

From 25dc274abd101087f789bc355460adbf5d9eb888 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 11 Mar 2024 09:55:11 +0200
Subject: [PATCH 10/16] devices: add Volla Phone 22 with new display
 (mimameid_h12)

This is mostly A copy of mimameid.yml but with Droidian support removed
(due to depending on Halium 12) and instead based on the new Halium 12
supporting the new display replacement panels.
---
 v2/devices/mimameid_h12.yml | 253 ++++++++++++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)
 create mode 100644 v2/devices/mimameid_h12.yml

diff --git a/v2/devices/mimameid_h12.yml b/v2/devices/mimameid_h12.yml
new file mode 100644
index 00000000..b47d1e5e
--- /dev/null
+++ b/v2/devices/mimameid_h12.yml
@@ -0,0 +1,253 @@
+name: "Volla Phone 22 with new display"
+codename: "mimameid_h12"
+formfactor: "phone"
+# TODO: add "mimameid" to aliases once ready to migrate all users
+aliases: []
+user_actions:
+  recovery:
+    title: "Reboot to Recovery"
+    description: 'With the device powered off, hold Volume Down + Power. You might be prompted to select a mode to boot into. If that happens, follow the on-screen instructions and select "Recovery" mode.'
+    image: "phone_power_up"
+    button: true
+  bootloader:
+    title: "Reboot to Bootloader"
+    description: 'With the device powered off, hold Volume Up + Power. You might be prompted to select a mode to boot into. If that happens, follow the on-screen instructions and select "Fastboot" mode.'
+    image: "phone_power_up"
+    button: true
+  boot:
+    title: "Reboot the device"
+    description: "Hold down the power button until the device powers down. Then, release it briefly and hold it down again until the device boots."
+    button: true
+unlock: []
+handlers:
+  bootloader_locked:
+    actions:
+      - fastboot:flashing_unlock:
+operating_systems:
+  - name: "Ubuntu Touch"
+    compatible_installer: ">=0.9.2-beta"
+    options:
+      - var: "channel"
+        name: "Channel"
+        tooltip: "The release channel"
+        link: "https://docs.ubports.com/en/latest/about/process/release-schedule.html"
+        type: "select"
+        remote_values:
+          systemimage:channels:
+      - var: "wipe"
+        name: "Wipe Userdata"
+        tooltip: "Wipe personal data. *Required* if switching from Volla OS."
+        type: "checkbox"
+      - var: "bootstrap"
+        name: "Bootstrap"
+        tooltip: "Flash system partitions using fastboot. Do NOT uncheck unless you know exactly what you're doing!"
+        type: "checkbox"
+        value: true
+    prerequisites: []
+    steps:
+      # Firmware setup (bootstrap)
+      - actions:
+          - core:download:
+              group: "firmware"
+              files:
+                - url: "https://volla.tech/filedump/volla-mimameid-12.0-ubports-installer-bootstrap.zip"
+                  checksum:
+                    sum: "bfcac4a2722bb01eb911d1daf9c9b50c246f5cb8e85cfa1aaaed5701d20bcc2c"
+                    algorithm: "sha256"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - core:unpack:
+              group: "firmware"
+              files:
+                - archive: "volla-mimameid-12.0-ubports-installer-bootstrap.zip"
+                  dir: "unpacked"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - adb:reboot:
+              to_state: "bootloader"
+        fallback:
+          - core:user_action:
+              action: "bootloader"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - fastboot:set_active:
+              slot: "a"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - fastboot:flash:
+              partitions:
+                - partition: "boot_a"
+                  file: "unpacked/boot.img"
+                  group: "firmware"
+                - partition: "dtbo_a"
+                  file: "unpacked/dtbo.img"
+                  group: "firmware"
+                - partition: "gz_a"
+                  file: "unpacked/gz.img"
+                  group: "firmware"
+                - partition: "lk_a"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
+                - partition: "logo"
+                  file: "unpacked/logo.img"
+                  group: "firmware"
+                - partition: "md1img_a"
+                  file: "unpacked/md1img.img"
+                  group: "firmware"
+                - partition: "preloader_a"
+                  file: "unpacked/preloader.img"
+                  group: "firmware"
+                - partition: "scp_a"
+                  file: "unpacked/scp.img"
+                  group: "firmware"
+                - partition: "spmfw_a"
+                  file: "unpacked/spmfw.img"
+                  group: "firmware"
+                - partition: "sspm_a"
+                  file: "unpacked/sspm.img"
+                  group: "firmware"
+                - partition: "super"
+                  file: "unpacked/super.img"
+                  group: "firmware"
+                - partition: "tee_a"
+                  file: "unpacked/tee.img"
+                  group: "firmware"
+                - partition: "vbmeta_a"
+                  file: "unpacked/vbmeta.img"
+                  group: "firmware"
+                  flags: ["--disable-verity"]
+        condition:
+          var: "bootstrap"
+          value: true
+
+      # Optionally wipe userdata
+      - actions:
+          - fastboot:format:
+              partition: "userdata"
+        condition:
+          var: "wipe"
+          value: true
+
+      # Reboot to UBports recovery to install UT
+      - actions:
+          - fastboot:reboot_recovery:
+        fallback:
+          - core:user_action:
+              action: "recovery"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - adb:reboot:
+              to_state: "recovery"
+        fallback:
+          - core:user_action:
+              action: "recovery"
+        condition:
+          var: "bootstrap"
+          value: false
+      - actions:
+          - systemimage:install:
+      - actions:
+          - adb:reboot:
+              to_state: "recovery"
+        fallback:
+          - core:user_action:
+              action: "recovery"
+    slideshow: []
+  - name: "Volla OS"
+    compatible_installer: ">=0.9.2-beta"
+    prerequisites: []
+    steps:
+      - actions:
+          - core:download:
+              group: "firmware"
+              files:
+                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20240228-stable-SPFLASH-mimameid.zip"
+                  checksum:
+                    sum: "7038740f7efc183a54a0bb5816c9d10fa8c7a5ef0a95cc19a2565255b060954e"
+                    algorithm: "sha256"
+      - actions:
+          - core:unpack:
+              group: "firmware"
+              files:
+                - archive: "volla-12.1-20240228-stable-SPFLASH-mimameid.zip"
+                  dir: "unpacked"
+      - actions:
+          - adb:reboot:
+              to_state: "bootloader"
+        fallback:
+          - core:user_action:
+              action: "bootloader"
+      - actions:
+          - fastboot:flash:
+              partitions:
+                - partition: "boot"
+                  file: "unpacked/boot.img"
+                  group: "firmware"
+                - partition: "dtbo"
+                  file: "unpacked/dtbo.img"
+                  group: "firmware"
+                - partition: "gz"
+                  file: "unpacked/gz.img"
+                  group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
+                - partition: "logo"
+                  file: "unpacked/logo.bin"
+                  group: "firmware"
+                - partition: "md1img"
+                  file: "unpacked/md1img.img"
+                  group: "firmware"
+                - partition: "preloader"
+                  file: "unpacked/preloader.img"
+                  group: "firmware"
+                - partition: "scp"
+                  file: "unpacked/scp.img"
+                  group: "firmware"
+                - partition: "spmfw"
+                  file: "unpacked/spmfw.img"
+                  group: "firmware"
+                - partition: "sspm"
+                  file: "unpacked/sspm.img"
+                  group: "firmware"
+                - partition: "super"
+                  file: "unpacked/super.img"
+                  group: "firmware"
+                - partition: "tee"
+                  file: "unpacked/tee.img"
+                  group: "firmware"
+                - partition: "vbmeta"
+                  file: "unpacked/vbmeta.img"
+                  group: "firmware"
+                - partition: "vbmeta_system"
+                  file: "unpacked/vbmeta_system.img"
+                  group: "firmware"
+                - partition: "vbmeta_vendor"
+                  file: "unpacked/vbmeta_vendor.img"
+                  group: "firmware"
+      - actions:
+          - fastboot:erase:
+              partition: "userdata"
+      - actions:
+          - fastboot:erase:
+              partition: "nvdata"
+      - actions:
+          - fastboot:reboot:
+        fallback:
+          - core:user_action:
+              action: "boot"
+    slideshow: []
+    eula:
+      title: "EULA"
+      description: "THE TERMS OF USE OF THE VOLLA OS ONLY ALLOW AN INSTALLATION ON A CLEARLY BRANDED VOLLA PHONE 22. To proceed with the installation you have to confirm that you have read and understood the End User License Agreement (EULA) of Hallo Welt Systeme UG (haftungsbeschränkt) for the Volla OS and agree to it."
+      link: "https://volla.online/en/eula/index.html"

From dd3b88a4a30e882c05867f4d7dbf28c01f1aef78 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 15 Mar 2024 17:02:39 +0200
Subject: [PATCH 11/16] yggdrasilx: fix booting to UBports recovery

Somehow the old recovery-as-boot trick doesn't work anymore, though
that's fine since the more modern approach of just booting recovery
seems to work instead.
---
 v2/devices/yggdrasilx.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/devices/yggdrasilx.yml b/v2/devices/yggdrasilx.yml
index 05dbf8a8..b9f22bff 100644
--- a/v2/devices/yggdrasilx.yml
+++ b/v2/devices/yggdrasilx.yml
@@ -138,10 +138,10 @@ operating_systems:
           var: "wipe"
           value: true
       - actions:
-          - fastboot:reboot:
+          - fastboot:reboot_recovery:
         fallback:
           - core:user_action:
-              action: "boot"
+              action: "recovery"
         condition:
           var: "bootstrap"
           value: true

From 34af4a828164beb8e08c5cd5a41a96711f6d7345 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 13 Mar 2024 13:06:47 +0200
Subject: [PATCH 12/16] yggdrasilx: sort flashed partitions alphabetically

---
 v2/devices/yggdrasilx.yml | 119 ++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 57 deletions(-)

diff --git a/v2/devices/yggdrasilx.yml b/v2/devices/yggdrasilx.yml
index b9f22bff..f2ca9d28 100644
--- a/v2/devices/yggdrasilx.yml
+++ b/v2/devices/yggdrasilx.yml
@@ -45,6 +45,7 @@ operating_systems:
         value: true
     prerequisites: []
     steps:
+      # Firmware setup (bootstrap)
       - actions:
           - core:download:
               group: "firmware"
@@ -77,18 +78,18 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
-                - partition: "recovery"
-                  file: "unpacked/recovery.img"
-                  group: "firmware"
-                - partition: "vendor"
-                  file: "unpacked/vendor.img"
-                  group: "firmware"
                 - partition: "boot"
                   file: "unpacked/recovery.img"
                   group: "firmware"
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
+                - partition: "lk2"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "unpacked/logo.img"
                   group: "firmware"
@@ -98,30 +99,30 @@ operating_systems:
                 - partition: "md1img"
                   file: "unpacked/md1img.img"
                   group: "firmware"
+                - partition: "preloader"
+                  file: "unpacked/preloader.img"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "unpacked/recovery.img"
+                  group: "firmware"
                 - partition: "spmfw"
                   file: "unpacked/spmfw.img"
                   group: "firmware"
-                - partition: "lk2"
-                  file: "unpacked/lk.img"
+                - partition: "sspm_1"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "sspm_2"
                   file: "unpacked/sspm.img"
                   group: "firmware"
-                - partition: "tee2"
+                - partition: "tee1"
                   file: "unpacked/tee.img"
                   group: "firmware"
-                - partition: "preloader"
-                  file: "unpacked/preloader.img"
-                  group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk.img"
-                  group: "firmware"
-                - partition: "sspm_1"
-                  file: "unpacked/sspm.img"
-                  group: "firmware"
-                - partition: "tee1"
+                - partition: "tee2"
                   file: "unpacked/tee.img"
                   group: "firmware"
+                - partition: "vendor"
+                  file: "unpacked/vendor.img"
+                  group: "firmware"
         condition:
           var: "bootstrap"
           value: true
@@ -131,12 +132,16 @@ operating_systems:
         condition:
           var: "bootstrap"
           value: true
+
+      # Optionally wipe userdata
       - actions:
           - fastboot:format:
               partition: "userdata"
         condition:
           var: "wipe"
           value: true
+
+      # Reboot to UBports recovery to install UT
       - actions:
           - fastboot:reboot_recovery:
         fallback:
@@ -195,15 +200,18 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
-                - partition: "recovery"
-                  file: "unpacked/recovery.img"
-                  group: "firmware"
                 - partition: "boot"
                   file: "unpacked/boot.img"
                   group: "firmware"
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
+                - partition: "lk2"
+                  file: "unpacked/lk.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "unpacked/logo.bin"
                   group: "firmware"
@@ -213,32 +221,29 @@ operating_systems:
                 - partition: "md1img"
                   file: "unpacked/md1img.img"
                   group: "firmware"
+                - partition: "preloader"
+                  file: "vollaos-10.1-ygdrassilx-preloader.bin"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "unpacked/recovery.img"
+                  group: "firmware"
                 - partition: "spmfw"
                   file: "unpacked/spmfw.img"
                   group: "firmware"
-                - partition: "lk2"
-                  file: "unpacked/lk.img"
+                - partition: "sspm_1"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "sspm_2"
                   file: "unpacked/sspm.img"
                   group: "firmware"
-                - partition: "tee2"
-                  file: "unpacked/tee.img"
-                  group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk.img"
-                  group: "firmware"
-                - partition: "sspm_1"
-                  file: "unpacked/sspm.img"
+                - partition: "system"
+                  file: "unpacked/system.img"
                   group: "firmware"
                 - partition: "tee1"
                   file: "unpacked/tee.img"
                   group: "firmware"
-                - partition: "preloader"
-                  file: "vollaos-10.1-ygdrassilx-preloader.bin"
-                  group: "firmware"
-                - partition: "system"
-                  file: "unpacked/system.img"
+                - partition: "tee2"
+                  file: "unpacked/tee.img"
                   group: "firmware"
                 - partition: "vendor"
                   file: "unpacked/vendor.img"
@@ -296,15 +301,18 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
-                - partition: "recovery"
-                  file: "unpacked/recovery.img"
-                  group: "firmware"
                 - partition: "boot"
                   file: "sailfish/sfe-yggdrasilx/Sailfish_OS/hybris-boot.img"
                   group: "firmware"
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
+                  group: "firmware"
+                - partition: "lk2"
+                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "sailfish/sfe-yggdrasilx/Sailfish_OS/logo.bin"
                   group: "firmware"
@@ -314,39 +322,36 @@ operating_systems:
                 - partition: "md1img"
                   file: "unpacked/md1img.img"
                   group: "firmware"
+                - partition: "preloader"
+                  file: "vollaos-10.1-ygdrassilx-preloader.bin"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "unpacked/recovery.img"
+                  group: "firmware"
                 - partition: "spmfw"
                   file: "unpacked/spmfw.img"
                   group: "firmware"
-                - partition: "lk2"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
+                - partition: "sspm_1"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "sspm_2"
                   file: "unpacked/sspm.img"
                   group: "firmware"
-                - partition: "tee2"
-                  file: "unpacked/tee.img"
-                  group: "firmware"
-                - partition: "lk"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
-                  group: "firmware"
-                - partition: "sspm_1"
-                  file: "unpacked/sspm.img"
+                - partition: "system"
+                  file: "unpacked/system.img"
                   group: "firmware"
                 - partition: "tee1"
                   file: "unpacked/tee.img"
                   group: "firmware"
-                - partition: "preloader"
-                  file: "vollaos-10.1-ygdrassilx-preloader.bin"
+                - partition: "tee2"
+                  file: "unpacked/tee.img"
                   group: "firmware"
-                - partition: "system"
-                  file: "unpacked/system.img"
+                - partition: "userdata"
+                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/sailfish.img001"
                   group: "firmware"
                 - partition: "vendor"
                   file: "unpacked/vendor.img"
                   group: "firmware"
-                - partition: "userdata"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/sailfish.img001"
-                  group: "firmware"
       - actions:
           - fastboot:erase:
               partition: "nvdata"

From 1ed5169036e934c4aa982592c934a03d01be0e00 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 14 Mar 2024 22:24:26 +0200
Subject: [PATCH 13/16] yggdrasilx: update VollaOS to 12.1-20240229

---
 v2/devices/yggdrasilx.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/v2/devices/yggdrasilx.yml b/v2/devices/yggdrasilx.yml
index f2ca9d28..85d51876 100644
--- a/v2/devices/yggdrasilx.yml
+++ b/v2/devices/yggdrasilx.yml
@@ -18,6 +18,10 @@ user_actions:
     title: "Reboot the device"
     description: "Hold down the power button until the device powers down. Then, release it briefly and hold it down again until the device boots."
     button: true
+  reboot_workaround:
+    title: "Workaround initial boot problem"
+    description: "Once a blank screen with the backlight comes up hold down the power button until the device powers down. Then, release it briefly and hold it down again until the device boots with Volla logo visible."
+    button: true
 unlock: []
 handlers:
   bootloader_locked:
@@ -177,19 +181,15 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/vollaos/volla-11.1-20221024-stable-SPFLASH-yggdrasilx.zip"
-                  checksum:
-                    sum: "25eb21d54ecb8a443d8944559f45eb9b6d2dd2df193c9f3221e49ee5da48ecd7"
-                    algorithm: "sha256"
-                - url: "https://volla.tech/filedump/vollaos-10.1-ygdrassilx-preloader.bin"
+                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20240229-stable-SPFLASH-yggdrasilx.zip"
                   checksum:
-                    sum: "64cf0d77edc360a91c5023513090539250715e0d2eea869518d9ea4f9d0871c1"
+                    sum: "fd1a7cd54e4ad1acda5077d3b213bec5ecc2c53bba10c4f66f5acf7ff5a198b1"
                     algorithm: "sha256"
       - actions:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-11.1-20221024-stable-SPFLASH-yggdrasilx.zip"
+                - archive: "volla-12.1-20240229-stable-SPFLASH-yggdrasilx.zip"
                   dir: "unpacked"
       - actions:
           - adb:reboot:
@@ -222,7 +222,7 @@ operating_systems:
                   file: "unpacked/md1img.img"
                   group: "firmware"
                 - partition: "preloader"
-                  file: "vollaos-10.1-ygdrassilx-preloader.bin"
+                  file: "unpacked/preloader_k63v2_64_bsp.bin"
                   group: "firmware"
                 - partition: "recovery"
                   file: "unpacked/recovery.img"
@@ -259,6 +259,9 @@ operating_systems:
         fallback:
           - core:user_action:
               action: "boot"
+      - actions:
+          - core:user_action:
+              action: "reboot_workaround"
     slideshow: []
     eula:
       title: "EULA"

From a0c3bbcbb4b5fe587c84f44ef21f270ead7fd5ee Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 15 Mar 2024 17:06:28 +0200
Subject: [PATCH 14/16] yggdrasilx: use proper SailfishOS artifacts from CI

Also stop flashing wrong logo.bin meant for yggdrasil which just shows
up as a blank boot screen on yggdrasilx.
---
 v2/devices/yggdrasilx.yml | 66 +++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/v2/devices/yggdrasilx.yml b/v2/devices/yggdrasilx.yml
index 85d51876..231c8ff1 100644
--- a/v2/devices/yggdrasilx.yml
+++ b/v2/devices/yggdrasilx.yml
@@ -270,7 +270,18 @@ operating_systems:
   - name: "SailfishOS"
     prerequisites: []
     compatible_installer: ">=0.9.2-beta"
+    options:
+      - var: "bootstrap"
+        name: "Bootstrap"
+        tooltip: "Flash system partitions using fastboot. Keep enabled if coming from non-Sailfish OS"
+        type: "checkbox"
+        value: true
     steps:
+      - actions:
+          - core:download:
+              group: "SailfishOS"
+              files:
+                - url: "https://gitlab.com/sailfishos-porters-ci/yggdrasil-ci/-/jobs/artifacts/master/download?job=run-build-x-lvm-testing"
       - actions:
           - core:download:
               group: "firmware"
@@ -283,18 +294,24 @@ operating_systems:
                   checksum:
                     sum: "64cf0d77edc360a91c5023513090539250715e0d2eea869518d9ea4f9d0871c1"
                     algorithm: "sha256"
-                - url: "https://volla.tech/filedump/sailfish-testing-vollax-dec-3-2021.zip"
-                  checksum:
-                    sum: "bf64b3b438e5f2673271d7bcfa6da7e937b1d9cf11e1740776bbb557a6363eac"
-                    algorithm: "sha256"
+        condition:
+          var: "bootstrap"
+          value: true
+      - actions:
+          - core:unpack:
+              group: "SailfishOS"
+              files:
+                - archive: "download?job=run-build-x-lvm-testing"
+                  dir: "unpacked"
       - actions:
           - core:unpack:
               group: "firmware"
               files:
                 - archive: "volla-10.1-20211002-RELEASE-SPFLASH-yggdrasilx.zip"
                   dir: "unpacked"
-                - archive: "sailfish-testing-vollax-dec-3-2021.zip"
-                  dir: "sailfish"
+        condition:
+          var: "bootstrap"
+          value: true
       - actions:
           - adb:reboot:
               to_state: "bootloader"
@@ -304,21 +321,9 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
-                - partition: "boot"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/hybris-boot.img"
-                  group: "firmware"
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
-                - partition: "lk"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
-                  group: "firmware"
-                - partition: "lk2"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
-                  group: "firmware"
-                - partition: "logo"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/logo.bin"
-                  group: "firmware"
                 - partition: "md1dsp"
                   file: "unpacked/md1dsp.img"
                   group: "firmware"
@@ -349,15 +354,30 @@ operating_systems:
                 - partition: "tee2"
                   file: "unpacked/tee.img"
                   group: "firmware"
-                - partition: "userdata"
-                  file: "sailfish/sfe-yggdrasilx/Sailfish_OS/sailfish.img001"
-                  group: "firmware"
                 - partition: "vendor"
                   file: "unpacked/vendor.img"
                   group: "firmware"
+        condition:
+          var: "bootstrap"
+          value: true
       - actions:
-          - fastboot:erase:
-              partition: "nvdata"
+          - fastboot:flash:
+              partitions:
+                - partition: "boot"
+                  file: "unpacked/sfe-yggdrasilx/Sailfish_OS/hybris-boot.img"
+                  group: "SailfishOS"
+                - partition: "lk"
+                  file: "unpacked/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
+                  group: "SailfishOS"
+                - partition: "lk2"
+                  file: "unpacked/sfe-yggdrasilx/Sailfish_OS/lk-yggdrasilx.img"
+                  group: "SailfishOS"
+                - partition: "logo"
+                  file: "unpacked/sfe-yggdrasilx/Sailfish_OS/logo_yggdrasilx.bin"
+                  group: "SailfishOS"
+                - partition: "userdata"
+                  file: "unpacked/sfe-yggdrasilx/Sailfish_OS/sailfish.img001"
+                  group: "SailfishOS"
       - actions:
           - fastboot:reboot:
         fallback:

From b90b563c18ccfcd88e7a0921536b91325d0427bb Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 15 Mar 2024 17:10:27 +0200
Subject: [PATCH 15/16] yggdrasil: alphabetically sort flashed partitions

For SFOS also flash lk2 and avoid flashing partitions twice.
---
 v2/devices/yggdrasil.yml | 56 ++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/v2/devices/yggdrasil.yml b/v2/devices/yggdrasil.yml
index c1adc865..e40bc5f5 100644
--- a/v2/devices/yggdrasil.yml
+++ b/v2/devices/yggdrasil.yml
@@ -204,18 +204,18 @@ operating_systems:
       - actions:
           - fastboot:flash:
               partitions:
-                - partition: "preloader"
-                  file: "preloader_k63v2_64_bsp.bin"
-                  group: "firmware"
-                - partition: "recovery"
-                  file: "unpacked/recovery.img"
-                  group: "firmware"
                 - partition: "boot"
                   file: "unpacked/boot.img"
                   group: "firmware"
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
+                - partition: "lk"
+                  file: "unpacked/lk-verified.img"
+                  group: "firmware"
+                - partition: "lk2"
+                  file: "unpacked/lk-verified.img"
+                  group: "firmware"
                 - partition: "logo"
                   file: "unpacked/logo-verified.bin"
                   group: "firmware"
@@ -225,29 +225,29 @@ operating_systems:
                 - partition: "md1img"
                   file: "unpacked/md1img-verified.img"
                   group: "firmware"
+                - partition: "preloader"
+                  file: "preloader_k63v2_64_bsp.bin"
+                  group: "firmware"
+                - partition: "recovery"
+                  file: "unpacked/recovery.img"
+                  group: "firmware"
                 - partition: "spmfw"
                   file: "unpacked/spmfw-verified.img"
                   group: "firmware"
-                - partition: "lk2"
-                  file: "unpacked/lk-verified.img"
+                - partition: "sspm_1"
+                  file: "unpacked/sspm-verified.img"
                   group: "firmware"
                 - partition: "sspm_2"
                   file: "unpacked/sspm-verified.img"
                   group: "firmware"
-                - partition: "tee2"
-                  file: "unpacked/tee-verified.img"
-                  group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk-verified.img"
-                  group: "firmware"
-                - partition: "sspm_1"
-                  file: "unpacked/sspm-verified.img"
+                - partition: "system"
+                  file: "unpacked/system.img"
                   group: "firmware"
                 - partition: "tee1"
                   file: "unpacked/tee-verified.img"
                   group: "firmware"
-                - partition: "system"
-                  file: "unpacked/system.img"
+                - partition: "tee2"
+                  file: "unpacked/tee-verified.img"
                   group: "firmware"
                 - partition: "vendor"
                   file: "unpacked/vendor.img"
@@ -333,9 +333,6 @@ operating_systems:
                 - partition: "dtbo"
                   file: "unpacked/dtbo.img"
                   group: "firmware"
-                - partition: "logo"
-                  file: "unpacked/logo.bin"
-                  group: "firmware"
                 - partition: "md1dsp"
                   file: "unpacked/md1dsp.img"
                   group: "firmware"
@@ -345,9 +342,6 @@ operating_systems:
                 - partition: "spmfw"
                   file: "unpacked/spmfw.img"
                   group: "firmware"
-                - partition: "lk2"
-                  file: "unpacked/lk.img"
-                  group: "firmware"
                 - partition: "sspm_2"
                   file: "unpacked/sspm.img"
                   group: "firmware"
@@ -357,9 +351,6 @@ operating_systems:
                 - partition: "preloader"
                   file: "unpacked/preloader_k63v2_64_bsp.bin"
                   group: "firmware"
-                - partition: "lk"
-                  file: "unpacked/lk.img"
-                  group: "firmware"
                 - partition: "sspm_1"
                   file: "unpacked/sspm.img"
                   group: "firmware"
@@ -378,14 +369,17 @@ operating_systems:
                 - partition: "boot"
                   file: "unpacked/sfe-yggdrasil/Sailfish_OS/hybris-boot.img"
                   group: "SailfishOS"
-                - partition: "userdata"
-                  file: "unpacked/sfe-yggdrasil/Sailfish_OS/sailfish.img001"
+                - partition: "lk"
+                  file: "unpacked/sfe-yggdrasil/Sailfish_OS/lk-yggdrasil.img"
+                  group: "SailfishOS"
+                - partition: "lk2"
+                  file: "unpacked/sfe-yggdrasil/Sailfish_OS/lk-yggdrasil.img"
                   group: "SailfishOS"
                 - partition: "logo"
                   file: "unpacked/sfe-yggdrasil/Sailfish_OS/logo.bin"
                   group: "SailfishOS"
-                - partition: "lk"
-                  file: "unpacked/sfe-yggdrasil/Sailfish_OS/lk-yggdrasil.img"
+                - partition: "userdata"
+                  file: "unpacked/sfe-yggdrasil/Sailfish_OS/sailfish.img001"
                   group: "SailfishOS"
       - actions:
           - fastboot:reboot:

From ee3ab7f79e9978b44abfb58e797c45864168a8b1 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 15 Mar 2024 12:15:43 +0200
Subject: [PATCH 16/16] yggdrasil: update VollaOS to 12.1-20240228

---
 v2/devices/yggdrasil.yml | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/v2/devices/yggdrasil.yml b/v2/devices/yggdrasil.yml
index e40bc5f5..7842c0e9 100644
--- a/v2/devices/yggdrasil.yml
+++ b/v2/devices/yggdrasil.yml
@@ -181,19 +181,15 @@ operating_systems:
           - core:download:
               group: "firmware"
               files:
-                - url: "https://volla.tech/filedump/vollaos/volla-11.1-20221017-stable-SPFLASH-yggdrasil.zip"
+                - url: "https://volla.tech/filedump/vollaos/volla-12.1-20240228-stable-SPFLASH-yggdrasil.zip"
                   checksum:
-                    sum: "86023751abe70b5824846b9e7ce4a27e1d55f836f2d226c3eba78c33b31bfa2f"
-                    algorithm: "sha256"
-                - url: "https://volla.tech/filedump/vollaos/preloader_k63v2_64_bsp.bin"
-                  checksum:
-                    sum: "cf730034fcd9074f366ae9bc7b2885c343caa8c4f8c88cf35f2e8965feca0f29"
+                    sum: "39c14ffaea550e72714e8931e95f20affe397153a8d7e75480e64c1b33e73205"
                     algorithm: "sha256"
       - actions:
           - core:unpack:
               group: "firmware"
               files:
-                - archive: "volla-11.1-20221017-stable-SPFLASH-yggdrasil.zip"
+                - archive: "volla-12.1-20240228-stable-SPFLASH-yggdrasil.zip"
                   dir: "unpacked"
       - actions:
           - adb:reboot:
@@ -211,43 +207,43 @@ operating_systems:
                   file: "unpacked/dtbo.img"
                   group: "firmware"
                 - partition: "lk"
-                  file: "unpacked/lk-verified.img"
+                  file: "unpacked/lk.img"
                   group: "firmware"
                 - partition: "lk2"
-                  file: "unpacked/lk-verified.img"
+                  file: "unpacked/lk.img"
                   group: "firmware"
                 - partition: "logo"
-                  file: "unpacked/logo-verified.bin"
+                  file: "unpacked/logo.bin"
                   group: "firmware"
                 - partition: "md1dsp"
-                  file: "unpacked/md1dsp-verified.img"
+                  file: "unpacked/md1dsp.img"
                   group: "firmware"
                 - partition: "md1img"
-                  file: "unpacked/md1img-verified.img"
+                  file: "unpacked/md1img.img"
                   group: "firmware"
                 - partition: "preloader"
-                  file: "preloader_k63v2_64_bsp.bin"
+                  file: "unpacked/preloader_k63v2_64_bsp.bin"
                   group: "firmware"
                 - partition: "recovery"
                   file: "unpacked/recovery.img"
                   group: "firmware"
                 - partition: "spmfw"
-                  file: "unpacked/spmfw-verified.img"
+                  file: "unpacked/spmfw.img"
                   group: "firmware"
                 - partition: "sspm_1"
-                  file: "unpacked/sspm-verified.img"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "sspm_2"
-                  file: "unpacked/sspm-verified.img"
+                  file: "unpacked/sspm.img"
                   group: "firmware"
                 - partition: "system"
                   file: "unpacked/system.img"
                   group: "firmware"
                 - partition: "tee1"
-                  file: "unpacked/tee-verified.img"
+                  file: "unpacked/tee.img"
                   group: "firmware"
                 - partition: "tee2"
-                  file: "unpacked/tee-verified.img"
+                  file: "unpacked/tee.img"
                   group: "firmware"
                 - partition: "vendor"
                   file: "unpacked/vendor.img"
@@ -274,7 +270,7 @@ operating_systems:
     options:
       - var: "bootstrap"
         name: "Bootstrap"
-        tooltip: "Flash system partitions using fastboot. Keep enabled if coming from Ubuntu Touch or Volla OS 10"
+        tooltip: "Flash system partitions using fastboot. Keep enabled if coming from non-Sailfish OS"
         type: "checkbox"
         value: true
     steps: