device/testing/device-xiaomi-daisy/30-gpu-firmware.files

-/lib/firmware/postmarketos/a506_zap.b00
-/lib/firmware/postmarketos/a506_zap.b01
-/lib/firmware/postmarketos/a506_zap.b02
-/lib/firmware/postmarketos/a506_zap.mdt
-/lib/firmware/postmarketos/a530_pfp.fw
-/lib/firmware/postmarketos/a530_pm4.fw

device/testing/device-xiaomi-daisy/APKBUILD

-# Maintainer: Alikates <alikates@dnyon.com>
+# Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=6
-pkgrel=4
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-msm8953 linux-postmarketos-qcom-msm8953 lk2nd-msm8953"
+depends="
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8953
+"
 makedepends="devicepkg-dev"
 subpackages="
-		$pkgname-nonfree-firmware:nonfree_firmware
-		$pkgname-modem
-		"
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="
 	deviceinfo
 	modules-initfs
-	30-gpu-firmware.files
-	"
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,23 +30,21 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm0644 "$srcdir"/30-gpu-firmware.files "$pkgdir"/usr/share/mkinitfs/files/30-gpu-firmware.files
 }
 
 nonfree_firmware() {
-	pkgdesc="Wi-Fi, ADSP Firmware"
-	depends="firmware-xiaomi-daisy"
-	mkdir "$subpkgdir"
-}
-
-modem() {
-	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
-	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-daisy
+		msm-firmware-loader
+		qbootctl
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
 8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
-cb1729cae5703aaf3aee069af5f3440b84d0958f4c3a9c5c027d4e6b62ca0792d2e09cbb9afb86e00e192cc29de41ebdc8365c09a1656867941acff098e07fb8  modules-initfs
-302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+0a1d769e4e60aca37dc71bdde9e6befbe74c09d775e19788d18a07e06546cbddd46efc876df0a89073f0819c9cc66e319f398772dec75f537ec5b82aa3032002  modules-initfs
 "

device/testing/device-xiaomi-daisy/modules-initfs

-msm
+bam_dma
 edt_ft5x06
-panel_mdss_ili7807_fhdplus
+msm
 panel_himax_hx8399c_fhdplus
+panel_mdss_ili7807_fhdplus
+panel_mdss_otm1911_fhdplus

device/testing/device-xiaomi-tissot/APKBUILD

-# Maintainer: Danila Tikhonov (JIaxyga) <JIaxyga@protonmail.com>
+# Maintainer: Danila Tikhonov (JIaxyga) <danila@jiaxyga.com>
+# Co-Maintainer: Barnabas Czeman <trabarni@gmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
 
 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
-pkgver=4
-pkgrel=4
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-msm8953 linux-postmarketos-qcom-msm8953 lk2nd-msm8953"
+depends="
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8953
+"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-modem"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,18 +30,18 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-xiaomi-tissot"
-	mkdir "$subpkgdir"
-}
-
-modem() {
-	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
-	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-tissot
+		msm-firmware-loader
+		qbootctl
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-2349246ddbe547acfd9630245e27f9acbf04b91739378864fa5f6f1be3646c88c46021e744dc893d038874ae1908f63d43ed1b235bbff2ea1982f1f2ecaee180  deviceinfo
-7a18ef4ec2d4b424a120f45b5451d6d7f81e58fa7c163a21354b5a3b18c6894126b79f4134270bd6d7a3275167831ac5b4f551697af4b59f61d20388e010ba1d  modules-initfs
+e94d5aeae51c697d4483dc1d7a5eb4980a37ad3dec693ddd8f7b829ed5583a200254b393d0337b3180e36289cb4eba60a6667bd3cf08d2c994a03ac3092d22df  deviceinfo
+f2ada69f818d5f8af2f2abbf556384f41584c175fadca5ea07ddb4a006648de11999153b27079236304ec1cf52c2bed0291501a363b55236631edf62c6b7e9a3  modules-initfs
 "

device/testing/device-xiaomi-tissot/deviceinfo

@@ -19,7 +19,7 @@ deviceinfo_swap_size_recommended="512"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=null PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/testing/device-xiaomi-tissot/modules-initfs

+bam_dma
 edt_ft5x06
 msm
-panel-mdss-ili7807-fhd
-panel-mdss-otm1911-fhd
-panel-mdss-ft8716-fhd
+panel_mdss_ft8716_fhd
+panel_mdss_ili7807_fhd
+panel_mdss_otm1911_fhd

device/testing/firmware-xiaomi-daisy/APKBUILD

+# Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 pkgname=firmware-xiaomi-daisy
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
 license="proprietary"
-depends="wcnss-wlan"
 _repository="firmware-xiaomi-daisy"
 _commit="9ae200b57743088f83a6f2b02a6b7ce4596a77d6"
 source="$pkgname-$_commit.tar.gz::https://github.com/alikates/firmware-xiaomi-daisy/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
-builddir="$srcdir/firmware-xiaomi-daisy-$_commit"
+builddir="$srcdir/firmware-xiaomi-daisy-$_commit/gpu"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"
 
 package() {
-	echo $source
-
-	# Modem firmware
-	install -Dm0644 modem/mba.mbn -t "$pkgdir/$_fwdir"
-	install -Dm0644 modem/modem.* -t "$pkgdir/$_fwdir"
-
-	# ADSP firmware
-	install -Dm0644 adsp/adsp.* -t "$pkgdir/$_fwdir"
-
-	# GPU and video acceleration firmwares
-	install -Dm0644 gpu/a5* -t "$pkgdir/$_fwdir"
-	install -Dm0644 gpu/venus.* -t "$pkgdir/$_fwdir"
-
-	# Wifi/BT firmware
-	install -Dm0644 wcnss/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir"/wlan/prima
-	install -Dm0644 wcnss/wcnss.* -t "$pkgdir/$_fwdir"
+	# GPU firmwares
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }
 
 sha512sums="

device/testing/firmware-xiaomi-tissot/30-gpu-firmware.files

-/lib/firmware/postmarketos/a506_zap.b00
-/lib/firmware/postmarketos/a506_zap.b01
-/lib/firmware/postmarketos/a506_zap.b02
-/lib/firmware/postmarketos/a506_zap.mdt
-/lib/firmware/postmarketos/a530_pfp.fw
-/lib/firmware/postmarketos/a530_pm4.fw

device/testing/firmware-xiaomi-tissot/APKBUILD

-# Maintainer: Danila Tikhonov (JIaxyga) <JIaxyga@protonmail.com>
+# Maintainer: Danila Tikhonov (JIaxyga) <danila@jiaxyga.com>
+# Co-Maintainer: Barnabas Czeman <trabarni@gmail.com>
 
 pkgname=firmware-xiaomi-tissot
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Mi A1"
 url="https://gitlab.com/jiaxyga/firmware-xiaomi-tissot"
 arch="aarch64"
-depends="linux-firmware-qcom firmware-xiaomi-tissot-initramfs"
 license="proprietary"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 
 _commit="bf686895224cae33c2130932b4a5914fea415287"
 
-source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	firmware.files
-	30-gpu-firmware.files"
-subpackages="$pkgname-initramfs:firmware_initramfs"
+source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"
 
 package() {
-	cd "$srcdir/$pkgname-$_commit/"
-	while IFS="" read -r _i || [ -n "$_i" ]; do
-		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
-		install -Dm644 $_i "$pkgdir/$_i"
-	done < "$srcdir/firmware.files"
-}
-
-firmware_initramfs() {
-	mkdir "$subpkgdir"
-	install -Dm644 "$srcdir"/30-gpu-firmware.files -t \
-		"$subpkgdir"/usr/share/mkinitfs/files
+	# GPU firmwares
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }
 
 sha512sums="
-e82c953fd1a1a665bcfcfc4eaab95fe8a017f1804e4bc66f6449cfeb21137f2ebcc0f8abab9ef9975c438d9836d68974b417bbe58c128b06cec605abecfad008  firmware-xiaomi-tissot.tar.gz
-d43fae933bb12e3879588e96f604be0534be5455bb9edbea3c9cf96bcffbce44abae27de3f40a118536254ca85faeb0fecf390f8f6ae60ca9d06887ac32a7462  firmware.files
-302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+e82c953fd1a1a665bcfcfc4eaab95fe8a017f1804e4bc66f6449cfeb21137f2ebcc0f8abab9ef9975c438d9836d68974b417bbe58c128b06cec605abecfad008  firmware-xiaomi-tissot-bf686895224cae33c2130932b4a5914fea415287.tar.gz
 "

device/testing/firmware-xiaomi-tissot/firmware.files

-./lib/firmware/postmarketos/a506_zap.b00
-./lib/firmware/postmarketos/a506_zap.b01
-./lib/firmware/postmarketos/a506_zap.b02
-./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.b14
-./lib/firmware/postmarketos/adsp.mdt
-./lib/firmware/postmarketos/mba.mbn
-./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/qdsp6m.qdb
-./lib/firmware/postmarketos/venus.b00
-./lib/firmware/postmarketos/venus.b01
-./lib/firmware/postmarketos/venus.b02
-./lib/firmware/postmarketos/venus.b03
-./lib/firmware/postmarketos/venus.b04
-./lib/firmware/postmarketos/venus.mdt
-./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

main/msm-firmware-loader/APKBUILD

 pkgname=msm-firmware-loader
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=0
 pkgdesc="Set of init services to automatically load firmware from device partitions"
 url="https://postmarketos.org/"
@@ -41,7 +41,7 @@ wcnss() {
 }
 
 sha512sums="
-9659d821c06c700ae566d5254f717af3a1f7ad2868ddd7ca3ec3955274e342c8c582599c8a823d13f38f4514fccc6b61b6dda9f28be84b73527d8a98152ba1ac  msm-firmware-loader-1.2.0.tar.gz
+7320a2c363b5e80459c5dcf1933d671c0aacf519c5e8084a07e126f3b0f7747926495b231f7494566971ccf9732ae8af0d3bc1ee49a1d8d176024c3610aa288f  msm-firmware-loader-1.3.0.tar.gz
 d9ad3b21564de9a4970a8923b8598fb46a54543ac9f1494676a6833800bc68c64f230737b308fec54aae09c2cf635794e8f1abc46253b0386260b4580587483d  msm-firmware-loader.initd
 616a28c3a65a45bb65f798989d93daacdeea08a90a9a8538b5bac2d73b2c8b135554ecaf49b4084829f88af760a144802adcd89b50f46bc267d6b04c9c733ff8  msm-firmware-loader-unpack.initd
 "