From a55dcb4c2625428e0a22faea0ddd04d73f43ca92 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <github@drakulix.de>
Date: Sat, 24 Jan 2026 15:36:28 +0100
Subject: [PATCH] device-ayaneo-pocket-s2: Support booting from UFS

Adds `qcom-ufs` to the initramfs to be able to boot
from UFS. Additionally it changes the boot partition
to `fat16`, which seems necessary for some reason for
the patched abl-efi to pick up the partition even
though this doesn't seem to be required booting from SD.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7877>
---
 device/testing/device-ayaneo-pocket-s2/APKBUILD       | 6 +++---
 device/testing/device-ayaneo-pocket-s2/deviceinfo     | 2 +-
 device/testing/device-ayaneo-pocket-s2/modules-initfs | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-ayaneo-pocket-s2/APKBUILD b/device/testing/device-ayaneo-pocket-s2/APKBUILD
index bac793421..a9aa33ca1 100644
--- a/device/testing/device-ayaneo-pocket-s2/APKBUILD
+++ b/device/testing/device-ayaneo-pocket-s2/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=device-ayaneo-pocket-s2
 pkgdesc="Ayaneo Pocket S2"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -45,8 +45,8 @@ package() {
 }
 
 sha512sums="
-1c85bb0c68fc6cb7836a8116661533684e4eb2fcb29b958f46f14e5ce1f207139d3c04d2b94f088abf48ac7bdb3c26c02097109f48c24ab5b4f756d997136145  deviceinfo
+012b1b6a9fcdfb6043b6f6992606a59fb347a5dde47c61f47479dccba24e13a88b0e03a64d79786d1152786c593874988deaa487fa7ec1634c4a7a4bcac20c34  deviceinfo
 6c6a1393fd91dbb565e5b09aacf5f18a0911de19074f25548174a2d1a6db6f52f27ea556bfb5f4731085c345c42047fddbacc2a77ffe288728ff96d4c7a2cbed  kernel-cmdline.conf
 5c219e5532705402a2cff81ae792ee5d74751bccfe0038d5ea2d6701cc07df860808f7879ba93a80241bfbcb2a2527587b1c1d770602dd682c15f7d5800d03a3  firmware.files
-bc2f6134fc2612344dacddfb4146d6c028f3d8916ba1e78598ed16307446f4266b76afadfdf18543813bbca2727eda8523b5f8467f89c65922e70221d004f899  modules-initfs
+d81fa838f41002c05d7db40104f3c9959be48009a08e479cbe57eca9a3dc7ab3328bfa2257a2c59cee1208b79f3d3b98d6caf9b0c7312d4a1746ad1f5660f168  modules-initfs
 "
diff --git a/device/testing/device-ayaneo-pocket-s2/deviceinfo b/device/testing/device-ayaneo-pocket-s2/deviceinfo
index c1b143500..1676d69ad 100644
--- a/device/testing/device-ayaneo-pocket-s2/deviceinfo
+++ b/device/testing/device-ayaneo-pocket-s2/deviceinfo
@@ -16,7 +16,7 @@ deviceinfo_external_storage="true"
 deviceinfo_drm="true"
 
 # Bootloader related
-deviceinfo_boot_filesystem="fat32"
+deviceinfo_boot_filesystem="fat16"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
diff --git a/device/testing/device-ayaneo-pocket-s2/modules-initfs b/device/testing/device-ayaneo-pocket-s2/modules-initfs
index ad8e00139..001a9d2c4 100644
--- a/device/testing/device-ayaneo-pocket-s2/modules-initfs
+++ b/device/testing/device-ayaneo-pocket-s2/modules-initfs
@@ -113,5 +113,6 @@ typec
 typec_ucsi
 ubwc_config
 ucsi_glink
+ufs-qcom
 usb_f_fs
 wcd939x-usbss