From bd2cdfbaf403fa36243a62dddb1443af0fc34fbe Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Wed, 12 Oct 2022 23:35:42 +0300 Subject: [PATCH] device-oneplus-dumpling: get linux-edge(-6.0.1) booting again (MR 3531) 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 --- device/testing/device-oneplus-dumpling/APKBUILD | 5 +++-- device/testing/device-oneplus-dumpling/deviceinfo | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device/testing/device-oneplus-dumpling/APKBUILD b/device/testing/device-oneplus-dumpling/APKBUILD index 317921d6f..b3c4c0dea 100644 --- a/device/testing/device-oneplus-dumpling/APKBUILD +++ b/device/testing/device-oneplus-dumpling/APKBUILD @@ -2,7 +2,7 @@ # Reference: pkgname=device-oneplus-dumpling pkgdesc="OnePlus 5T" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -34,6 +34,7 @@ package() { } 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" depends="linux-edge linux-firmware-none" devicepkg_subpackage_kernel $startdir $pkgname $subpkgname @@ -59,6 +60,6 @@ phosh() { } sha512sums=" -77dd1e5ef535f911165e77803e0fbb4fc8c25bc4524dafb149f3365b701b5606182b351de346b1a337c36a58ccb96c46963d9e9c3a78b5459e2ebe342d0243e7 deviceinfo +cf52087ee21e05d6b9851c6d5b582277ebc631cf36dd48570a5553cdc16d8381c5c7f84ebe38a1f8c4dfe83ab2a7bc66a4e0e8b19314a17472349fae8ee03164 deviceinfo 2288f08a44aae5136c0c0c846501c2bd4bcb10f05454b40c6e4490d398385b8a7129216047b5eb7982ca6d62d3aa71f3e18bfb8661d0cd32c8a600685ca0da48 phoc.ini " diff --git a/device/testing/device-oneplus-dumpling/deviceinfo b/device/testing/device-oneplus-dumpling/deviceinfo index c9d332db6..f8e6816b1 100644 --- a/device/testing/device-oneplus-dumpling/deviceinfo +++ b/device/testing/device-oneplus-dumpling/deviceinfo @@ -40,10 +40,9 @@ deviceinfo_append_dtb="true" # Close to mainline kernel options # 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_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" # Alpine kernel options 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 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" +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"