motorola-potter: use msm-firmware-loader & cleanups (MR 4870)

Changes:
- use msm-firmware-loader
- use soc-qcom-msm8953
- cleanup firmware package
- add tqftpserv as a dependency for modem
- add modules-initfs with panel and touchscreen modules

[ci:skip-build]: already built successfully in CI

device/testing/device-motorola-potter/APKBUILD

@@ -2,15 +2,21 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-potter
 pkgdesc="Motorola Moto G5 Plus"
-pkgver=0.3
+pkgver=1
-pkgrel=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-msm8953 mkbootimg lk2nd-msm8953"
+depends="
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8953
+"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo modules-initfs"
 
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -26,10 +32,18 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/Wi-Fi/Bluetooth/Audio/Video/Modem firmware"
-	depends="firmware-motorola-potter"
+	depends="
+		firmware-motorola-potter
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+		tqftpserv
+		tqftpserv-openrc
+	"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-36556104aeaa3ad3f4a299bacf94317fcd0c95f753f935a4bddf29964b3314ca1fe24b11c606d111372d0bfb4690018fdf2f2c87e7590a4828dac9891933f1a4  deviceinfo
+31f181f7115af01efa032e23d11a6e311308d3ba1bb8465e5c17bde00f4f47b3dd49755a2ff41f598275d310dcd7de5a5cd35140ad0482b36b0fe53dcd71cf66  deviceinfo
+93c77bfcde005c021ac9b671f9671923339f855e45d4fce8b2caea4748eccc08c8ec65bdfc85fef4900c974860613e8d62e6fe0ea95741ec1ab08c814148472b  modules-initfs
 "

device/testing/device-motorola-potter/deviceinfo

@@ -21,6 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/testing/device-motorola-potter/modules-initfs

@@ -0,0 +1,5 @@
+msm
+panel_boe_bs052fhm_a00_6c01
+panel_tianma_tl052vdxp02
+rmi_core
+rmi_i2c

device/testing/firmware-motorola-potter/APKBUILD

@@ -1,31 +1,35 @@
 # Maintainer: Sireesh Kodali <scarface@disroot.org>
 pkgname=firmware-motorola-potter
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Motorola Moto G5 Plus"
 url="https://github.com/scarface-one/firmware-motorola-potter"
 arch="aarch64"
-depends="linux-firmware-qcom soc-qcom-msm8916-ucm"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps"
 _commit="cce83e64585c036facd4cef39f47bc23d18ba2e9"
-builddir="$srcdir/$pkgname-$_commit"
+builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
+install="$pkgname.post-install $pkgname.post-upgrade"
+_fwdir="/lib/firmware"
 
-source="$pkgname-$_commit.tar.gz::https://github.com/scarface-one/firmware-motorola-potter/archive/$_commit.tar.gz
+source="
+	$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz
 	moto-modem-rfs-setup.openrc
-	firmware.files
+"
-	firmware-motorola-potter.post-install"
 
 package() {
 	install -Dm755 $srcdir/moto-modem-rfs-setup.openrc "$pkgdir"/etc/init.d/moto-modem-rfs-setup
 
-	while IFS="" read -r _i || [ -n "$_i" ]; do
+	# GPU Firmware files
-		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
-		echo $_i
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
-		install -Dm644 $_i "$pkgdir/$_i"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
-	done < "$srcdir/firmware.files"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
+
+	# WLAN Firmware
+	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir/wlan/prima"
 }
-sha512sums="5a35ff1b567b672585f761eddbc772163f52b312c1e94410eff4b1d333852857a2f87769a45f47f7bcff373bdd5b062c3d16110e0211d85f83a7b4c6c78f6d3c  firmware-motorola-potter-cce83e64585c036facd4cef39f47bc23d18ba2e9.tar.gz
+sha512sums="
+5a35ff1b567b672585f761eddbc772163f52b312c1e94410eff4b1d333852857a2f87769a45f47f7bcff373bdd5b062c3d16110e0211d85f83a7b4c6c78f6d3c  firmware-motorola-potter-cce83e64585c036facd4cef39f47bc23d18ba2e9.tar.gz
 d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
-dc7b179abb099ab61bc72e8941be38d3e94bd1a43b37617b34e1a63835bb8399ee79a87d556996dfbed032e40554ca48a2ff9e9817d80ed1415db3f369266b38  firmware.files
+"
-784ac120a2231cfbee153fb8b2634af4ab5091eaa8fe207e66b47641d7531591ee3849e610bb66c7177822c86556f78d51c17ba8e4f3da2f946c4b8c5eaaf310  firmware-motorola-potter.post-install"

device/testing/firmware-motorola-potter/firmware-motorola-potter.post-upgrade

@@ -0,0 +1 @@
+firmware-motorola-potter.post-install

device/testing/firmware-motorola-potter/firmware.files

@@ -1,59 +0,0 @@
-./lib/firmware/postmarketos/a506_zap.b00
-./lib/firmware/postmarketos/a506_zap.b01
-./lib/firmware/postmarketos/a506_zap.b02
-./lib/firmware/postmarketos/a506_zap.elf
-./lib/firmware/postmarketos/a506_zap.mdt
-./lib/firmware/postmarketos/a530_pfp.fw
-./lib/firmware/postmarketos/a530_pm4.fw
-./lib/firmware/postmarketos/adsp.b00
-./lib/firmware/postmarketos/adsp.b01
-./lib/firmware/postmarketos/adsp.b02
-./lib/firmware/postmarketos/adsp.b03
-./lib/firmware/postmarketos/adsp.b04
-./lib/firmware/postmarketos/adsp.b05
-./lib/firmware/postmarketos/adsp.b06
-./lib/firmware/postmarketos/adsp.b07
-./lib/firmware/postmarketos/adsp.b08
-./lib/firmware/postmarketos/adsp.b09
-./lib/firmware/postmarketos/adsp.b10
-./lib/firmware/postmarketos/adsp.b11
-./lib/firmware/postmarketos/adsp.b12
-./lib/firmware/postmarketos/adsp.b13
-./lib/firmware/postmarketos/adsp.mdt
-./lib/firmware/postmarketos/modem.b00
-./lib/firmware/postmarketos/modem.b01
-./lib/firmware/postmarketos/modem.b02
-./lib/firmware/postmarketos/modem.b04
-./lib/firmware/postmarketos/modem.b05
-./lib/firmware/postmarketos/modem.b06
-./lib/firmware/postmarketos/modem.b07
-./lib/firmware/postmarketos/modem.b08
-./lib/firmware/postmarketos/modem.b09
-./lib/firmware/postmarketos/modem.b10
-./lib/firmware/postmarketos/modem.b11
-./lib/firmware/postmarketos/modem.b12
-./lib/firmware/postmarketos/modem.b13
-./lib/firmware/postmarketos/modem.b16
-./lib/firmware/postmarketos/modem.b17
-./lib/firmware/postmarketos/modem.b18
-./lib/firmware/postmarketos/modem.b19
-./lib/firmware/postmarketos/modem.b20
-./lib/firmware/postmarketos/modem.mdt
-./lib/firmware/postmarketos/mba.mbn
-./lib/firmware/postmarketos/wcnss.b00
-./lib/firmware/postmarketos/wcnss.b01
-./lib/firmware/postmarketos/wcnss.b02
-./lib/firmware/postmarketos/wcnss.b04
-./lib/firmware/postmarketos/wcnss.b06
-./lib/firmware/postmarketos/wcnss.b09
-./lib/firmware/postmarketos/wcnss.b10
-./lib/firmware/postmarketos/wcnss.b11
-./lib/firmware/postmarketos/wcnss.b12
-./lib/firmware/postmarketos/wcnss.mdt
-./lib/firmware/postmarketos/wlan/prima/WCNSS_qcom_wlan_nv.bin
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.b00
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.b01
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.b02
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.b03
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.b04
-./lib/firmware/postmarketos/qcom/venus-4.2/venus.mdt