device/community/device-oneplus-enchilada/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -36,7 +36,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs
+		 soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/device-oneplus-fajita/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -36,7 +36,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs
+		 soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/device-shift-axolotl/APKBUILD

@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,7 +42,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
-	depends="firmware-shift-sdm845 firmware-shift-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-shift-sdm845 firmware-shift-sdm845-initramfs
+		 soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/device-xiaomi-beryllium/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -40,7 +40,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU, venus, modem firmware"
-	depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware
+		 soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/soc-qcom-sdm845/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
 pkgver=14
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 "
 replaces="upower"
 subpackages="
+	$pkgname-modem
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-qbootctl
 	$pkgname-ucm
@@ -40,20 +41,14 @@ package() {
 		"$pkgdir"/etc/UPower/UPower.conf
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware"
+modem() {
+	pkgdesc="Modem services and configuration"
 	depends="
-	pd-mapper
-	pd-mapper-openrc
-	tqftpserv
-	tqftpserv-openrc
-	q6voiced
-	q6voiced-openrc
-	msm-modem
-	msm-modem-uim-selection
-	bootmac
-	alsa-utils
-"
+		q6voiced
+		q6voiced-openrc
+		msm-modem-uim-selection
+	"
+
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
@@ -72,6 +67,22 @@ nonfree_firmware() {
 		"$subpkgdir"/etc/conf.d/call_audio_idle_suspend_workaround
 }
 
+nonfree_firmware() {
+	pkgdesc="Modem, WiFi and GPU Firmware"
+	depends="
+		pd-mapper
+		pd-mapper-openrc
+		tqftpserv
+		tqftpserv-openrc
+		msm-modem
+		bootmac
+		alsa-utils
+	"
+
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir "$subpkgdir"
+}
+
 ucm() {
 	provides="alsa-ucm-conf"
 	provider_priority=1

device/community/soc-qcom-sdm845/soc-qcom-sdm845-modem.post-install

+#!/bin/sh
+rc-update add q6voiced default
+rc-update add call_audio_idle_suspend_workaround default

device/community/soc-qcom-sdm845/soc-qcom-sdm845-modem.post-upgrade

+soc-qcom-sdm845-modem.post-install
\ No newline at end of file

device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install

 #!/bin/sh
 rc-update add tqftpserv boot
 rc-update add pd-mapper boot
-rc-update add q6voiced default
-rc-update add call_audio_idle_suspend_workaround default

device/testing/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=0.4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,7 +31,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
-	depends="firmware-google-sargo linux-firmware-qca linux-firmware-qcom msm-firmware-loader soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-google-sargo linux-firmware-qca linux-firmware-qcom
+		 msm-firmware-loader soc-qcom-sdm845-modem soc-qcom-sdm845-nonfree-firmware"
 
 	# Create an empty sub-package directory because this sub-package is empty
 	mkdir "$subpkgdir"

device/testing/device-thundercomm-db845c/APKBUILD

+
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+
+pkgname=device-thundercomm-db845c
+pkgdesc="Thundercomm Dragonboard 845c"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	postmarketos-base
+	postmarketos-update-kernel
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+	soc-qcom-sdm845-qbootctl
+	fwupd>=1.8.6
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="Modem, GPU and WiFi Firmware"
+	depends="linux-firmware-qcom soc-qcom-sdm845-nonfree-firmware"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+832731020692787e954daca9ddff33b2c5e4d66858dc4b78927d290f366101b958d1226b3da8fd5078bb04c3d94b80abe8c4962ce0aa8d60ec8825de49de3207  deviceinfo
+"

device/testing/device-thundercomm-db845c/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Thundercomm Dragonboard 845c"
+deviceinfo_manufacturer="Thundercomm"
+deviceinfo_codename="thundercomm-db845c"
+deviceinfo_year="2019"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_mesa_driver="msm"
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1920"
+deviceinfo_screen_height="1080"
+deviceinfo_no_framebuffer="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+deviceinfo_flash_fastboot_partition_system="rootfs"
+deviceinfo_getty="ttyMSM0;115200"
+
+# Kernel
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="qcom/sdm845-db845c"
+deviceinfo_flash_kernel_on_update="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
+
+deviceinfo_modules_initfs="lontium-lt9611"

device/testing/device-xiaomi-polaris/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-polaris
 pkgdesc="Xiaomi Mi Mix 2S"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -37,7 +37,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-xiaomi-polaris firmware-xiaomi-polaris-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-xiaomi-polaris firmware-xiaomi-polaris-initramfs
+		 soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 }
 

device/testing/soc-qcom-msm8998/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8998
 pkgdesc="Common package for Qualcomm MSM8998 devices"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -18,6 +18,7 @@ package() {
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware"
 	depends="
+	soc-qcom-sdm845-modem
 	soc-qcom-sdm845-nonfree-firmware
 	qcom-diag
 	qcom-diag-openrc