From 0c874f231fb579287b5cff981f78c97a45da5e1d Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Sun, 4 Sep 2022 01:24:03 +0200 Subject: [PATCH] sdm710-common: Move FM support to common Change-Id: I3f00beb299051ca2c72cce4a947cea01f04bcdc8 --- BoardConfigCommon.mk | 9 +++++++++ manifest_fm.xml | 7 +++++++ proprietary-files.txt | 11 +++++++---- sdm710.mk | 8 ++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 manifest_fm.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 64815a7..903fd0c 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -60,6 +60,12 @@ ifeq ($(TARGET_HAS_UDFPS),true) TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/xiaomi:libudfps_extension.xiaomi endif +# FM +ifeq ($(TARGET_HAS_FM),true) +BOARD_HAS_QCA_FM_SOC := "cherokee" +BOARD_HAVE_QCOM_FM := true +endif + # Kernel BOARD_BOOT_HEADER_VERSION := 2 BOARD_KERNEL_BASE := 0x00000000 @@ -139,6 +145,9 @@ BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1 # VINTF DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml +ifeq ($(TARGET_HAS_FM),true) +DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_fm.xml +endif ifeq ($(TARGET_HAS_NFC),true) DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_nfc.xml endif diff --git a/manifest_fm.xml b/manifest_fm.xml new file mode 100644 index 0000000..6c106ed --- /dev/null +++ b/manifest_fm.xml @@ -0,0 +1,7 @@ + + + vendor.qti.hardware.fm + hwbinder + @1.0::IFmHci/default + + diff --git a/proprietary-files.txt b/proprietary-files.txt index 7655b43..5fc8ee0 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -55,10 +55,6 @@ vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc -# Bluetooth (FM) - from pyxis -vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so|1d191661a6aee776e3b2a851354dc2cbc819bfef -vendor/lib64/vendor.qti.hardware.fm@1.0.so|17e86e9a2054db733d955fcf1066f6e06a44fb21 - # CDSP vendor/bin/cdsprpcd vendor/etc/init/vendor.qti.cdsprpc-service.rc @@ -258,6 +254,13 @@ vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy vendor/lib/vendor.qti.hardware.dsp@1.0.so vendor/lib64/vendor.qti.hardware.dsp@1.0.so +# FM - from pyxis +system_ext/lib64/fm_helium.so|55ef376cc802574df92025bebaba1cebcc74a918 +system_ext/lib64/libfm-hci.so|0cfbf3d84724428721973cc7ad22f5d1e1368591 +system_ext/lib64/vendor.qti.hardware.fm@1.0.so|4a2522113d6b737a87d3b43233f1afa94d9e45ad +vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so|1d191661a6aee776e3b2a851354dc2cbc819bfef +vendor/lib64/vendor.qti.hardware.fm@1.0.so|17e86e9a2054db733d955fcf1066f6e06a44fb21 + # Graphics (Adreno) vendor/lib/egl/eglSubDriverAndroid.so vendor/lib/egl/libEGL_adreno.so diff --git a/sdm710.mk b/sdm710.mk index f42bb22..26a6b25 100644 --- a/sdm710.mk +++ b/sdm710.mk @@ -163,6 +163,14 @@ PRODUCT_PACKAGES += \ vendor.goodix.hardware.biometrics.fingerprint@2.1.vendor endif +# FM +ifeq ($(TARGET_HAS_FM),true) +PRODUCT_PACKAGES += \ + FM2 \ + libqcomfm_jni \ + qcom.fmradio +endif + # Gatekeeper PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0.vendor