From 00b7fe46b3aabded950ee15684700db91340090c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= Date: Sun, 10 Sep 2023 19:13:44 +0200 Subject: [PATCH] xiaomi-markw: switch to msm-firmware-loader and clean ups (MR 4433) It utilize msm-firmware-loader for minimize device specific firmware package. It add necessary modules to intramfs for fix fde. modem package has been removed in favor of soc-qcom-msm8953-modem. 30-gpu-firmware-files has been removed. --- device/testing/device-xiaomi-markw/APKBUILD | 15 +- .../device-xiaomi-markw/modules-initfs | 5 +- .../30-gpu-firmware.files | 6 - device/testing/firmware-xiaomi-markw/APKBUILD | 30 +-- .../firmware-xiaomi-markw/firmware.files | 202 ------------------ 5 files changed, 24 insertions(+), 234 deletions(-) delete mode 100644 device/testing/firmware-xiaomi-markw/30-gpu-firmware.files delete mode 100644 device/testing/firmware-xiaomi-markw/firmware.files diff --git a/device/testing/device-xiaomi-markw/APKBUILD b/device/testing/device-xiaomi-markw/APKBUILD index 6034f82fd..d4fdcf09c 100644 --- a/device/testing/device-xiaomi-markw/APKBUILD +++ b/device/testing/device-xiaomi-markw/APKBUILD @@ -1,8 +1,9 @@ +# Maintainer: Victor Pavlov (vipaoL) # Reference: pkgname=device-xiaomi-markw pkgdesc="Xiaomi Redmi 4 Prime" -pkgver=1.0 -pkgrel=4 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -28,10 +29,16 @@ package() { nonfree_firmware() { pkgdesc="WiFi, Bluetooth, Modem, Display and GPU Firmware" - depends="firmware-xiaomi-markw" + depends=" + firmware-xiaomi-markw + msm-firmware-loader + soc-qcom-msm8953-initramfs + soc-qcom-msm8953-modem + " mkdir "$subpkgdir" } + sha512sums=" 0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d deviceinfo -44efe9884cf2af88efd4bfbb68536977eac9cc04e5d270b9fc38d308f0181161fc968456ab2ca9b82996aa3cc5bff33dae590048c35fdbafdcef273bc5269613 modules-initfs +a99cfed9b2b5afed33127874706841fc6e85dd0e663c5d924c8d22ec0c93f86c72d22943dcf1af5f7a840915c13e713583d359ffbefae812c95e3a5824d492e8 modules-initfs " diff --git a/device/testing/device-xiaomi-markw/modules-initfs b/device/testing/device-xiaomi-markw/modules-initfs index 5797c8eb6..a88e25331 100644 --- a/device/testing/device-xiaomi-markw/modules-initfs +++ b/device/testing/device-xiaomi-markw/modules-initfs @@ -1,5 +1,6 @@ +atmel_mxt_ts +bam_dma +edt_ft5x06 msm panel_mdss_nt35596_ebbg panel_mdss_r63350 -atmel_mxt_ts -edt_ft5x06 diff --git a/device/testing/firmware-xiaomi-markw/30-gpu-firmware.files b/device/testing/firmware-xiaomi-markw/30-gpu-firmware.files deleted file mode 100644 index 3364b8f4c..000000000 --- a/device/testing/firmware-xiaomi-markw/30-gpu-firmware.files +++ /dev/null @@ -1,6 +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.mdt -/lib/firmware/postmarketos/a530_pfp.fw -/lib/firmware/postmarketos/a530_pm4.fw diff --git a/device/testing/firmware-xiaomi-markw/APKBUILD b/device/testing/firmware-xiaomi-markw/APKBUILD index 07489f328..14a30dbc7 100644 --- a/device/testing/firmware-xiaomi-markw/APKBUILD +++ b/device/testing/firmware-xiaomi-markw/APKBUILD @@ -1,38 +1,28 @@ # Maintainer: vipaoL pkgname=firmware-xiaomi-markw -pkgver=1 +pkgver=2 pkgrel=0 pkgdesc="Firmware files for Xiaomi Redmi 4 Prime (markw)" url="https://gitlab.com/vipaoL/firmware-xiaomi-markw" arch="aarch64" -depends="firmware-xiaomi-markw-initramfs" license="proprietary" options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native" _commit="8cc7f7d9e56aa9fa0193403b694115d759eafaf2" -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=" -f57ec60776f0cfd89ccc0f4a561aa261367b299796b4a9121814c560eab7a28b3049a3defcc129942098b88937fad8f6c3bbf2d1ac7d89d4175c8ec4014c1a8a firmware-xiaomi-markw.tar.gz -da36a1dee69c3dd2bbd5557a547b93ab23a2e8993fe1c735ebd25cc6258b54e981daca9d3461c848835e623f7c7694c73bcb05527170ab3ea171049d5352c703 firmware.files -302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74 30-gpu-firmware.files +f57ec60776f0cfd89ccc0f4a561aa261367b299796b4a9121814c560eab7a28b3049a3defcc129942098b88937fad8f6c3bbf2d1ac7d89d4175c8ec4014c1a8a firmware-xiaomi-markw-8cc7f7d9e56aa9fa0193403b694115d759eafaf2.tar.gz " diff --git a/device/testing/firmware-xiaomi-markw/firmware.files b/device/testing/firmware-xiaomi-markw/firmware.files deleted file mode 100644 index 7066facda..000000000 --- a/device/testing/firmware-xiaomi-markw/firmware.files +++ /dev/null @@ -1,202 +0,0 @@ -./lib/firmware/postmarketos/smplap64.mdt -./lib/firmware/postmarketos/modem.b04 -./lib/firmware/postmarketos/modem.b07 -./lib/firmware/postmarketos/widevine.mdt -./lib/firmware/postmarketos/dhsecapp.b01 -./lib/firmware/postmarketos/cmnlib.b04 -./lib/firmware/postmarketos/cmnlib.b03 -./lib/firmware/postmarketos/qmpsecap.b02 -./lib/firmware/postmarketos/secauth.b01 -./lib/firmware/postmarketos/mlipay.b01 -./lib/firmware/postmarketos/modem.b17 -./lib/firmware/postmarketos/wcnss.b00 -./lib/firmware/postmarketos/adsp.b02 -./lib/firmware/postmarketos/fpcta.b05 -./lib/firmware/postmarketos/smplap64.b02 -./lib/firmware/postmarketos/qdsp6m.qdb -./lib/firmware/postmarketos/cppf.b05 -./lib/firmware/postmarketos/cmnlib.b00 -./lib/firmware/postmarketos/cmnlib.b02 -./lib/firmware/postmarketos/cmnlib.b05 -./lib/firmware/postmarketos/goodixfp.b04 -./lib/firmware/postmarketos/smplap64.b04 -./lib/firmware/postmarketos/smplap32.b01 -./lib/firmware/postmarketos/fpcta.b03 -./lib/firmware/postmarketos/modem.mdt -./lib/firmware/postmarketos/cardapp.b05 -./lib/firmware/postmarketos/wcnss.b12 -./lib/firmware/postmarketos/cardapp.mdt -./lib/firmware/postmarketos/smplap32.b04 -./lib/firmware/postmarketos/wcnss.b10 -./lib/firmware/postmarketos/vsimapp.b03 -./lib/firmware/postmarketos/modem.b16 -./lib/firmware/postmarketos/modem.b00 -./lib/firmware/postmarketos/fpcta.b01 -./lib/firmware/postmarketos/gptest.b06 -./lib/firmware/postmarketos/isdbtmm.mdt -./lib/firmware/postmarketos/mlipay.b02 -./lib/firmware/postmarketos/venus.b02 -./lib/firmware/postmarketos/securemm.b06 -./lib/firmware/postmarketos/widevine.b00 -./lib/firmware/postmarketos/adsp.b01 -./lib/firmware/postmarketos/goodixfp.b01 -./lib/firmware/postmarketos/smplap64.b05 -./lib/firmware/postmarketos/mdtp.b03 -./lib/firmware/postmarketos/secauth.b02 -./lib/firmware/postmarketos/modem.b10 -./lib/firmware/postmarketos/cppf.b01 -./lib/firmware/postmarketos/mlipay.b06 -./lib/firmware/postmarketos/qmpsecap.b06 -./lib/firmware/postmarketos/smplap32.b02 -./lib/firmware/postmarketos/mlipay.b05 -./lib/firmware/postmarketos/widevine.b04 -./lib/firmware/postmarketos/vsimapp.b06 -./lib/firmware/postmarketos/cmnlib.mdt -./lib/firmware/postmarketos/isdbtmm.b01 -./lib/firmware/postmarketos/isdbtmm.b03 -./lib/firmware/postmarketos/wlan/prima/WCNSS_qcom_wlan_nv.bin -./lib/firmware/postmarketos/cardapp.b02 -./lib/firmware/postmarketos/smplap64.b01 -./lib/firmware/postmarketos/wcnss.b11 -./lib/firmware/postmarketos/dhsecapp.b06 -./lib/firmware/postmarketos/secauth.mdt -./lib/firmware/postmarketos/adsp.b09 -./lib/firmware/postmarketos/cmnlib64.b00 -./lib/firmware/postmarketos/mlipay.b00 -./lib/firmware/postmarketos/dhsecapp.b03 -./lib/firmware/postmarketos/adsp.b03 -./lib/firmware/postmarketos/mba.mbn -./lib/firmware/postmarketos/secauth.b06 -./lib/firmware/postmarketos/adsp.b11 -./lib/firmware/postmarketos/secauth.b05 -./lib/firmware/postmarketos/qmpsecap.mdt -./lib/firmware/postmarketos/goodixfp.b06 -./lib/firmware/postmarketos/fpcta.b06 -./lib/firmware/postmarketos/gptest.b05 -./lib/firmware/postmarketos/mlipay.b04 -./lib/firmware/postmarketos/securemm.b00 -./lib/firmware/postmarketos/gptest.b00 -./lib/firmware/postmarketos/widevine.b05 -./lib/firmware/postmarketos/securemm.b01 -./lib/firmware/postmarketos/isdbtmm.b05 -./lib/firmware/postmarketos/cppf.b03 -./lib/firmware/postmarketos/goodixfp.b00 -./lib/firmware/postmarketos/adsp.b13 -./lib/firmware/postmarketos/goodixfp.mdt -./lib/firmware/postmarketos/wcnss.b04 -./lib/firmware/postmarketos/cppf.b02 -./lib/firmware/postmarketos/vsimapp.mdt -./lib/firmware/postmarketos/fpcta.mdt -./lib/firmware/postmarketos/goodixfp.b05 -./lib/firmware/postmarketos/cardapp.b00 -./lib/firmware/postmarketos/widevine.b06 -./lib/firmware/postmarketos/goodixfp.b02 -./lib/firmware/postmarketos/cppf.b06 -./lib/firmware/postmarketos/adsp.mdt -./lib/firmware/postmarketos/wcnss.b09 -./lib/firmware/postmarketos/smplap64.b03 -./lib/firmware/postmarketos/cmnlib64.b01 -./lib/firmware/postmarketos/qmpsecap.b03 -./lib/firmware/postmarketos/vsimapp.b02 -./lib/firmware/postmarketos/isdbtmm.b06 -./lib/firmware/postmarketos/fpcta.b02 -./lib/firmware/postmarketos/smplap64.b00 -./lib/firmware/postmarketos/mlipay.b03 -./lib/firmware/postmarketos/mdtp.b02 -./lib/firmware/postmarketos/mdtp.b05 -./lib/firmware/postmarketos/cmnlib64.b02 -./lib/firmware/postmarketos/dhsecapp.mdt -./lib/firmware/postmarketos/venus.b03 -./lib/firmware/postmarketos/cardapp.b06 -./lib/firmware/postmarketos/smplap32.b00 -./lib/firmware/postmarketos/modem.b09 -./lib/firmware/postmarketos/wcnss.mdt -./lib/firmware/postmarketos/venus.b00 -./lib/firmware/postmarketos/fpcta.b04 -./lib/firmware/postmarketos/adsp.b05 -./lib/firmware/postmarketos/mdtp.b00 -./lib/firmware/postmarketos/cppf.b04 -./lib/firmware/postmarketos/adsp.b00 -./lib/firmware/postmarketos/venus.b01 -./lib/firmware/postmarketos/gptest.mdt -./lib/firmware/postmarketos/cardapp.b04 -./lib/firmware/postmarketos/securemm.b05 -./lib/firmware/postmarketos/wcnss.b02 -./lib/firmware/postmarketos/mlipay.mdt -./lib/firmware/postmarketos/modem.b06 -./lib/firmware/postmarketos/widevine.b02 -./lib/firmware/postmarketos/venus.mdt -./lib/firmware/postmarketos/modem.b11 -./lib/firmware/postmarketos/dhsecapp.b05 -./lib/firmware/postmarketos/secauth.b03 -./lib/firmware/postmarketos/vsimapp.b00 -./lib/firmware/postmarketos/goodixfp.b03 -./lib/firmware/postmarketos/fpcta.b00 -./lib/firmware/postmarketos/dhsecapp.b00 -./lib/firmware/postmarketos/widevine.b01 -./lib/firmware/postmarketos/mdtp.b04 -./lib/firmware/postmarketos/smplap32.mdt -./lib/firmware/postmarketos/gptest.b01 -./lib/firmware/postmarketos/smplap64.b06 -./lib/firmware/postmarketos/adsp.b06 -./lib/firmware/postmarketos/modem.b20 -./lib/firmware/postmarketos/isdbtmm.b02 -./lib/firmware/postmarketos/qmpsecap.b00 -./lib/firmware/postmarketos/adsp.b04 -./lib/firmware/postmarketos/securemm.b03 -./lib/firmware/postmarketos/gptest.b04 -./lib/firmware/postmarketos/cmnlib64.b03 -./lib/firmware/postmarketos/secauth.b04 -./lib/firmware/postmarketos/gptest.b03 -./lib/firmware/postmarketos/modem.b01 -./lib/firmware/postmarketos/cmnlib64.b04 -./lib/firmware/postmarketos/cppf.b00 -./lib/firmware/postmarketos/cardapp.b03 -./lib/firmware/postmarketos/gptest.b02 -./lib/firmware/postmarketos/venus.b04 -./lib/firmware/postmarketos/securemm.b02 -./lib/firmware/postmarketos/adsp.b08 -./lib/firmware/postmarketos/securemm.b04 -./lib/firmware/postmarketos/isdbtmm.b00 -./lib/firmware/postmarketos/modem.b19 -./lib/firmware/postmarketos/qmpsecap.b04 -./lib/firmware/postmarketos/vsimapp.b04 -./lib/firmware/postmarketos/vsimapp.b01 -./lib/firmware/postmarketos/mdtp.b01 -./lib/firmware/postmarketos/cmnlib.b01 -./lib/firmware/postmarketos/vsimapp.b05 -./lib/firmware/postmarketos/isdbtmm.b04 -./lib/firmware/postmarketos/wcnss.b01 -./lib/firmware/postmarketos/cppf.mdt -./lib/firmware/postmarketos/smplap32.b05 -./lib/firmware/postmarketos/mdtp.b06 -./lib/firmware/postmarketos/smplap32.b03 -./lib/firmware/postmarketos/modem.b02 -./lib/firmware/postmarketos/adsp.b12 -./lib/firmware/postmarketos/modem.b05 -./lib/firmware/postmarketos/qmpsecap.b01 -./lib/firmware/postmarketos/adsp.b07 -./lib/firmware/postmarketos/qmpsecap.b05 -./lib/firmware/postmarketos/modem.b08 -./lib/firmware/postmarketos/smplap32.b06 -./lib/firmware/postmarketos/dhsecapp.b04 -./lib/firmware/postmarketos/mdtp.mdt -./lib/firmware/postmarketos/secauth.b00 -./lib/firmware/postmarketos/cmnlib64.b05 -./lib/firmware/postmarketos/modem.b18 -./lib/firmware/postmarketos/modem.b13 -./lib/firmware/postmarketos/cardapp.b01 -./lib/firmware/postmarketos/securemm.mdt -./lib/firmware/postmarketos/modem.b12 -./lib/firmware/postmarketos/dhsecapp.b02 -./lib/firmware/postmarketos/gptauuid.xml -./lib/firmware/postmarketos/wcnss.b06 -./lib/firmware/postmarketos/widevine.b03 -./lib/firmware/postmarketos/cmnlib64.mdt -./lib/firmware/postmarketos/adsp.b10 -./lib/firmware/postmarketos/a506_zap.mdt -./lib/firmware/postmarketos/a506_zap.b01 -./lib/firmware/postmarketos/a506_zap.b00 -./lib/firmware/postmarketos/a506_zap.b02 -./lib/firmware/postmarketos/a530_pfp.fw -./lib/firmware/postmarketos/a530_pm4.fw