forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

modem/msm-modem: rename msm-modem-mainline to msm-modem-rpmsg (MR 1356)

Browse source 
Newer Qualcomm SoCs (e.g. SDM845. MSM8953) seem to use a different
method to talk to the modem. There are no longer separate rpmsg/SMD
channels for QMI messags, instead the modem is also available through QRTR.

On these newer SoCs, installing msm-modem-mainline is pointless,
because the created /dev/modem device will not actually allow
communicating with the modem. However, you still need the part from
the base package (msm-modem), which installs+enables rmtfs.

To avoid confusion, rename the msm-modem-mainline subpackage to
msm-modem-rpmsg. Install only "msm-modem" on SDM845 because that
likely does not allow communication with the modem through RPMSG
anyway.
This commit is contained in:
Minecrell 2020-06-21 15:07:32 +02:00 • committed by Bart Ribbers
parent 7cdd140b97
commit 8e080015d7
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
8 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
device/community/soc-qcom-msm8916/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=soc-qcom-msm8916 pkgname=soc-qcom-msm8916
pkgdesc="Common package for Qualcomm MSM8916 devices" pkgdesc="Common package for Qualcomm MSM8916 devices"
pkgver=7 pkgver=7
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="BSD-3-Clause" license="BSD-3-Clause"
arch="aarch64 armv7" arch="aarch64 armv7"
@ -23,7 +23,7 @@ package() {
} }
modem() { modem() {
depends="msm-modem-mainline q6voiced" depends="msm-modem-rpmsg q6voiced"
install="$subpkgname.post-install" install="$subpkgname.post-install"
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

4
device/testing/device-fairphone-fp2/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=device-fairphone-fp2 pkgname=device-fairphone-fp2
pkgdesc="Fairphone 2" pkgdesc="Fairphone 2"
pkgver=2 pkgver=2
pkgrel=12 pkgrel=13
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="armv7" arch="armv7"
@ -56,7 +56,7 @@ downstream_firmware() {
mainline_firmware() { mainline_firmware() {
pkgdesc="Firmware support packages for mainline kernel" pkgdesc="Firmware support packages for mainline kernel"
depends="msm-modem-mainline firmware-adreno" depends="msm-modem-rpmsg firmware-adreno"
install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware" install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
device/testing/device-lg-hammerhead/APKBUILD
View file

@ -1,7 +1,7 @@
# Reference: <https://postmarketos.org/devicepkg> # Reference: <https://postmarketos.org/devicepkg>
pkgname=device-lg-hammerhead pkgname=device-lg-hammerhead
pkgver=2 pkgver=2
pkgrel=21 pkgrel=22
pkgdesc="Google Nexus 5" pkgdesc="Google Nexus 5"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="armv7" arch="armv7"
@ -55,7 +55,7 @@ weston() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="WiFi, GPU, Modem and ADSP firmware" pkgdesc="WiFi, GPU, Modem and ADSP firmware"
depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem msm-modem-mainline" depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem msm-modem-rpmsg"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
device/testing/device-oneplus-oneplus3/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=device-oneplus-oneplus3 pkgname=device-oneplus-oneplus3
pkgdesc="OnePlus 3" pkgdesc="OnePlus 3"
pkgver=1 pkgver=1
pkgrel=2 pkgrel=3
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -32,7 +32,7 @@ nonfree_firmware() {
linux-firmware-ath10k linux-firmware-ath10k
linux-firmware-qca linux-firmware-qca
firmware-oneplus-oneplus3-op3 firmware-oneplus-oneplus3-op3
msm-modem-mainline msm-modem-rpmsg
" "
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
device/testing/device-oneplus-oneplus3t/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=device-oneplus-oneplus3t pkgname=device-oneplus-oneplus3t
pkgdesc="OnePlus 3T" pkgdesc="OnePlus 3T"
pkgver=1 pkgver=1
pkgrel=2 pkgrel=3
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -32,7 +32,7 @@ nonfree_firmware() {
linux-firmware-ath10k linux-firmware-ath10k
linux-firmware-qca linux-firmware-qca
firmware-oneplus-oneplus3-op3t firmware-oneplus-oneplus3-op3t
msm-modem-mainline msm-modem-rpmsg
" "
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
device/testing/soc-qcom-sdm845/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=soc-qcom-sdm845 pkgname=soc-qcom-sdm845
pkgdesc="Common package for Qualcomm SDM845 devices" pkgdesc="Common package for Qualcomm SDM845 devices"
pkgver=1 pkgver=1
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="BSD-3-Clause" license="BSD-3-Clause"
arch="aarch64" arch="aarch64"
@ -16,7 +16,7 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware" pkgdesc="Modem, WiFi and GPU Firmware"
depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem-mainline" depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem"
install="$subpkgname.post-install" install="$subpkgname.post-install"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

14
modem/msm-modem/APKBUILD
View file

@ -1,25 +1,25 @@
pkgname=msm-modem pkgname=msm-modem
pkgver=1 pkgver=1
pkgrel=1 pkgrel=2
pkgdesc="Common support for Qualcomm MSM modems" pkgdesc="Common support for Qualcomm MSM modems"
url="https://postmarketos.org/" url="https://postmarketos.org/"
arch="armhf armv7 aarch64" arch="armhf armv7 aarch64"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
depends="rmtfs rmtfs-openrc" depends="rmtfs rmtfs-openrc"
install="$pkgname.post-install" install="$pkgname.post-install"
subpackages="$pkgname-mainline $pkgname-downstream" subpackages="$pkgname-rpmsg $pkgname-downstream"
source="udev-mainline.rules udev-downstream.rules" source="udev-rpmsg.rules udev-downstream.rules"
options="!check" options="!check"
package() { package() {
mkdir -p "$pkgdir" mkdir -p "$pkgdir"
} }
mainline() { rpmsg() {
pkgdesc="$pkgdesc (mainline)" pkgdesc="$pkgdesc (via RPMSG)"
depends="$pkgname rpmsgexport" depends="$pkgname rpmsgexport"
install -Dm644 "$srcdir/udev-mainline.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules" install -Dm644 "$srcdir/udev-rpmsg.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
} }
downstream() { downstream() {
@ -29,5 +29,5 @@ downstream() {
install -Dm644 "$srcdir/udev-downstream.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules" install -Dm644 "$srcdir/udev-downstream.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
} }
sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab udev-mainline.rules sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab udev-rpmsg.rules
64a40fb88d40ae0ff64d3545f7a54c6f10f2ab366ef75b8b158c2d5a3733223839c87aed8d5c6685d5056a5840d3943e68c76bd1bda2b48388161849d5e253f3 udev-downstream.rules" 64a40fb88d40ae0ff64d3545f7a54c6f10f2ab366ef75b8b158c2d5a3733223839c87aed8d5c6685d5056a5840d3943e68c76bd1bda2b48388161849d5e253f3 udev-downstream.rules"

0
modem/msm-modem/udev-mainline.rules → modem/msm-modem/udev-rpmsg.rules
View file