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

device-oneplus-dumpling: get linux-edge(-6.0.1) booting again (MR 3531)

Browse source 
Additionally switch mainline kernel from qcom_fg to bq27xxx_battery_i2c.

While at it simplify the deviceinfo_modules_initfs_alpine list to
exclude implicit dependencies that mkinitfs can find itself to make the
line length a bit less unwieldy.

[ci:skip-build] Already built successfuly on CI in MR
This commit is contained in:
Jami Kettunen 2022-10-12 23:35:42 +03:00 committed by Newbyte
parent 1769b565ed
commit bd2cdfbaf4
No known key found for this signature in database
GPG key ID: 5873C171C9429CFA
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
device/testing/device-oneplus-dumpling/APKBUILD
View file

@ -2,7 +2,7 @@
# Reference: <https://postmarketos.org/devicepkg> # Reference: <https://postmarketos.org/devicepkg>
pkgname=device-oneplus-dumpling pkgname=device-oneplus-dumpling
pkgdesc="OnePlus 5T" pkgdesc="OnePlus 5T"
pkgver=3 pkgver=4
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
@ -34,6 +34,7 @@ package() {
} }
kernel_alpine() { kernel_alpine() {
# FIXME: msm-modem-uim-selection hangs boot for some 20 seconds when installed with non-free FW
pkgdesc="Pure mainline kernel, unpatched Alpine linux-edge" pkgdesc="Pure mainline kernel, unpatched Alpine linux-edge"
depends="linux-edge linux-firmware-none" depends="linux-edge linux-firmware-none"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@ -59,6 +60,6 @@ phosh() {
} }
sha512sums=" sha512sums="
77dd1e5ef535f911165e77803e0fbb4fc8c25bc4524dafb149f3365b701b5606182b351de346b1a337c36a58ccb96c46963d9e9c3a78b5459e2ebe342d0243e7 deviceinfo cf52087ee21e05d6b9851c6d5b582277ebc631cf36dd48570a5553cdc16d8381c5c7f84ebe38a1f8c4dfe83ab2a7bc66a4e0e8b19314a17472349fae8ee03164 deviceinfo
2288f08a44aae5136c0c0c846501c2bd4bcb10f05454b40c6e4490d398385b8a7129216047b5eb7982ca6d62d3aa71f3e18bfb8661d0cd32c8a600685ca0da48 phoc.ini 2288f08a44aae5136c0c0c846501c2bd4bcb10f05454b40c6e4490d398385b8a7129216047b5eb7982ca6d62d3aa71f3e18bfb8661d0cd32c8a600685ca0da48 phoc.ini
" "

5
device/testing/device-oneplus-dumpling/deviceinfo
View file

@ -40,10 +40,9 @@ deviceinfo_append_dtb="true"
# Close to mainline kernel options # Close to mainline kernel options
# We need 'clk_ignore_unused' for now or we don't get graphics # We need 'clk_ignore_unused' for now or we don't get graphics
deviceinfo_kernel_cmdline_mainline="clk_ignore_unused quiet loglevel=5 modprobe.blacklist=ipa" deviceinfo_kernel_cmdline_mainline="clk_ignore_unused quiet loglevel=5 modprobe.blacklist=ipa"
deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fc1 msm i2c-qup rmi_i2c qcom_fg qcom_spmi_haptics" deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fc1 msm i2c-qup bq27xxx_battery_i2c rmi_i2c qcom_spmi_haptics"
deviceinfo_mesa_driver_mainline="msm" deviceinfo_mesa_driver_mainline="msm"
# Alpine kernel options # Alpine kernel options
deviceinfo_kernel_cmdline_alpine="PMOS_NO_OUTPUT_REDIRECT" deviceinfo_kernel_cmdline_alpine="PMOS_NO_OUTPUT_REDIRECT"
# TODO: minimize (remove item -> check if module stays in initramfs) deviceinfo_modules_initfs_alpine="fixed qcom_glink_rpm qcom_smd-regulator qcom-apcs-ipc-mailbox gcc-msm8998 mmcc-msm8998 phy-qcom-qmp-ufs phy-qcom-qusb2 dwc3 dwc3-qcom nvmem_qfprom qcom-spmi-pmic qcom-pon governor_simpleondemand clk-smd-rpm ufs_qcom i2c-qup bam_dma rmi_i2c"
deviceinfo_modules_initfs_alpine="fixed qcom_glink_rpm smd-rpm qcom_smd-regulator qcom-apcs-ipc-mailbox clk-qcom gcc-msm8998 phy-qcom-qmp phy-qcom-qusb2 configfs libcomposite udc-core dwc3 dwc3-qcom af_packet nvmem_qfprom spmi qcom-spmi-pmic qcom-pon governor_simpleondemand clk-smd-rpm ufs_qcom evdev i2c-qup bam_dma rmi_i2c"