From 25f9af2fdf50a2f38c25a6681796bf0a2f2549e5 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Fri, 25 Jul 2025 09:16:35 +0200
Subject: [PATCH] device-fairphone-fp6: update dtb naming, enable internal
 storage options

The dtb was renamed to follow the new upstream naming guidelines.

Add configuration and dependencies that now make sense given that
internal storage is working.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6962>
---
 device/testing/device-fairphone-fp6/APKBUILD   | 8 ++++++--
 device/testing/device-fairphone-fp6/deviceinfo | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/device/testing/device-fairphone-fp6/APKBUILD b/device/testing/device-fairphone-fp6/APKBUILD
index 208760964..26e42c5b7 100644
--- a/device/testing/device-fairphone-fp6/APKBUILD
+++ b/device/testing/device-fairphone-fp6/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp6
 pkgdesc="The Fairphone (Gen. 6)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -18,8 +18,12 @@ depends="
 	firmware-fairphone-fp6-venus
 	firmware-fairphone-fp6-wpss
 	linux-postmarketos-qcom-sm7635
+	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
 "
 makedepends="devicepkg-dev"
 source="
@@ -40,6 +44,6 @@ package() {
 
 sha512sums="
 17533b261db6ead91b360e2d71355297fc3ad37f3fc68f6f03a8f7bb31e1ca82ecc403454aa360c7eace9164199086422f9e2d7507e24e4695caa8d3c117034f  00-mesa.sh
-0d7de7bbf1aa84782320f290294cd1f8fb545b9ac12ad862eb3df4def7a221c11d316b52a34269d127d436a479fe58f0c56d0d2b9b65896592b0794daaff9742  deviceinfo
+b6fd85a06f911d27ba998ebb987002c094d4ec1c14ad458274e0ea38f73af03c9739447094d8312cf623401b5bfe92d087fc063008eecab3a2f1331907d44f65  deviceinfo
 c535c211a6d594605e0e2af3536e457b4b6a4b833f26efda4dbd514597d080393a621338c274173f4633eadefc0c2ae830f7ceaa4cbe56a1e6715ff825af18f1  modules-initfs
 "
diff --git a/device/testing/device-fairphone-fp6/deviceinfo b/device/testing/device-fairphone-fp6/deviceinfo
index 6e3314779..1f118d587 100644
--- a/device/testing/device-fairphone-fp6/deviceinfo
+++ b/device/testing/device-fairphone-fp6/deviceinfo
@@ -7,9 +7,10 @@ deviceinfo_name="Fairphone (Gen. 6)"
 deviceinfo_manufacturer="Fairphone"
 deviceinfo_codename="fairphone-fp6"
 deviceinfo_year="2025"
-deviceinfo_dtb="qcom/sm7635-fairphone-fp6"
+deviceinfo_dtb="qcom/milos-fairphone-fp6"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"
 
 # Device related
 deviceinfo_gpu_accelerated="true"
@@ -34,4 +35,5 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_header_version="2"
 deviceinfo_bootimg_custom_args="--os_version 99.87.36 --os_patch_level 2099-12-31"
 deviceinfo_rootfs_image_sector_size="4096"
+deviceinfo_super_partitions="/dev/sda12 /dev/sda12"
 deviceinfo_flash_sparse="true"