berlna: Move nfc config to vendor

Change-Id: If0db1fecd8a2d415073d75ef3df79ad4d4a6d8c4
berlna: Add missing Camera ICP firmware
2025-09-18 01:34:33 -03:00 · 2025-09-18 01:09:34 -03:00 · 2025-09-18 00:57:38 -03:00 · 2025-09-12 00:53:25 -03:00 · 2025-09-12 00:27:25 -03:00 · 2025-09-12 00:10:51 -03:00
17 changed files with 68 additions and 187 deletions
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -5,15 +5,12 @@

 DEVICE_PATH := device/motorola/berlna

-# Inherit from motorola sm7325-common
-include device/motorola/sm7325-common/BoardConfigCommon.mk
+# Inherit from motorola sm8350-common
+include device/motorola/sm8350-common/BoardConfigCommon.mk

 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := berlna

-# HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
-
 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlna
 TARGET_KERNEL_CONFIG += vendor/lineage_berlna.config
@@ -50,3 +47,4 @@ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 37

 # inherit from the proprietary version
 include vendor/motorola/berlna/BoardConfigVendor.mk
+include vendor/motorola/berlna-radio/BoardConfigVendor.mk
--- a/configs/idc/uinput-egis.idc
+++ b/configs/idc/uinput-egis.idc
@@ -1,9 +0,0 @@
-#
-# Egis Touch sensor driver
-#
-#
-
-device.internal = 1
-keyboard.layout = uinput-egis
-keyboard.builtIn = 1
-keyboard.orientationAware = 1
--- a/configs/idc/uinput_nav.idc
+++ b/configs/idc/uinput_nav.idc
@@ -1,5 +0,0 @@
-# Goodix side-type fingerprint sensor
-device.internal = 1
-keyboard.layout = uinput_nav
-keyboard.builtIn = 1
-keyboard.orientationAware = 1
--- a/configs/keylayout/uinput-egis.kl
+++ b/configs/keylayout/uinput-egis.kl
@@ -1,9 +0,0 @@
-#
-# ETS320 Touch sensor driver
-#
-
-
-# ets320 "finger present"
-key 618   SYSTEM_NAVIGATION_UP
-key 619   SYSTEM_NAVIGATION_DOWN
-key 622   SYSTEM_NAVIGATION_LEFT
--- a/configs/keylayout/uinput_nav.kl
+++ b/configs/keylayout/uinput_nav.kl
@@ -1,7 +0,0 @@
-# Goodix side-type fingerprint sensor
-
-key 103  SYSTEM_NAVIGATION_UP
-key 108  SYSTEM_NAVIGATION_DOWN
-
-# use SYSTEM_NAVIGATION_LEFT for double-tap gesture
-key 115  SYSTEM_NAVIGATION_LEFT
--- a/device.mk
+++ b/device.mk
@@ -17,8 +17,8 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi

 PRODUCT_SHIPPING_API_LEVEL := 30

-# Inherit from motorola sm7325-common
-$(call inherit-product, device/motorola/sm7325-common/common.mk)
+# Inherit from motorola sm8350-common
+$(call inherit-product, device/motorola/sm8350-common/common.mk)

 # Overlays
 PRODUCT_PACKAGES += \
@@ -41,12 +41,7 @@ PRODUCT_COPY_FILES += \

 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.berlna \
-
-$(foreach f,$(wildcard $(LOCAL_PATH)/configs/idc/*.idc),\
-        $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/usr/idc/$(notdir $f)))
-$(foreach f,$(wildcard $(LOCAL_PATH)/configs/keylayout/*.kl),\
-        $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(notdir $f)))
+    android.hardware.biometrics.fingerprint@2.1-service.berlna

 # Init
 PRODUCT_PACKAGES += \
@@ -54,7 +49,6 @@ PRODUCT_PACKAGES += \
    init.ets.rc \
    init.mmi.overlay.rc \
    init.recovery.berlna.rc \
-    init.vendor.st21nfc.rc \
    init.oem.fingerprint2.sh \
    load_touch.sh.recovery

@@ -62,6 +56,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    android.hardware.light-service.lineage

+# Moto Camera 4
+TARGET_MOTCAMERA4 := berlna
+TARGET_USES_MOTCAMERA4 := true
+
+$(call inherit-product, vendor/motorola/MotCamera4-lahaina/motcamera4.mk)
+
 # NFC
 PRODUCT_PACKAGES += \
    android.hardware.nfc@1.2-service.st \
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,19 @@
+[
+  {
+    "repository": "device_motorola_sm8350-common",
+    "target_path": "device/motorola/sm8350-common",
+    "remote": "evo-devices"
+  },
+  {
+    "repository": "Deivid-21s-Sources/proprietary_vendor_motorola_berlna",
+    "target_path": "vendor/motorola/berlna",
+    "remote": "github-non-los",
+    "branch": "lineage-22.2"
+  },
+  {
+    "repository": "Deivid-21s-Sources/proprietary_vendor_motorola_berlna-radio",
+    "target_path": "vendor/motorola/berlna-radio",
+    "remote": "gitlab",
+    "branch": "lineage-22.2"
+  }
+]
--- a/extract-files.py
+++ b/extract-files.py
@@ -22,7 +22,7 @@ from extract_utils.main import (
 )

 namespace_imports = [
-    'vendor/motorola/sm7325-common',
+    'vendor/motorola/sm8350-common',
    'hardware/motorola',
    'hardware/qcom-caf/sm8350',
    'hardware/qcom-caf/wlan',
@@ -60,6 +60,6 @@ module = ExtractUtilsModule(

 if __name__ == '__main__':
    utils = ExtractUtils.device_with_common(
-        module, 'sm7325-common', module.vendor
+        module, 'sm8350-common', module.vendor
    )
    utils.run()
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
+
 prebuilt_etc {
    name: "android.hardware.biometrics.fingerprint@2.1-service-ets2.rc",
    src: "android.hardware.biometrics.fingerprint@2.1-service-ets2.rc",
@@ -9,7 +10,6 @@ prebuilt_etc {
    vendor: true,
 }

-
 prebuilt_etc {
    name: "init.ets.rc",
    src: "init.ets.rc",
@@ -31,13 +31,6 @@ prebuilt_etc {
    recovery: true,
 }

-prebuilt_etc {
-    name: "init.vendor.st21nfc.rc",
-    src: "init.vendor.st21nfc.rc",
-    sub_dir: "init/hw",
-    vendor: true,
-}
-
 sh_binary {
    name: "init.oem.fingerprint2.sh",
    src: "init.oem.fingerprint2.sh",
--- a/init/init.vendor.st21nfc.rc
+++ b/init/init.vendor.st21nfc.rc
@@ -1,23 +0,0 @@
-
-# This file needs to be executed by vendor_init at boot of the device,
-# both in normal and factory mode.
-
-on post-fs
-	# Change ownership and permision of st nfc device
-	chown nfc nfc /dev/st21nfc
-	chmod 0660 /dev/st21nfc
-
-on property:ro.vendor.hw.nfc=true && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-on property:ro.vendor.hw.nfc=st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-on property:ro.vendor.hw.nfc=ese_st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-service vendor.stflashtool /vendor/bin/STFlashTool -c /vendor/etc/st21nfc_conf.txt -P vendor.nfc.fw_status
-	group nfc
-	user nfc
-	oneshot
-	disabled
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_motorola_sm7325-common",
-    "target_path": "device/motorola/sm7325-common"
-  }
-]
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<manifest version="2.0" type="device">
-    <hal format="hidl">
-        <name>vendor.lineage.livedisplay</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IPictureAdjustment</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>ISunlightEnhancement</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
--- a/product.prop
+++ b/product.prop
@@ -16,7 +16,6 @@ ro.opa.device_model_id=motorola-berlna
 # Moto
 persist.mot_bt.aptx_cert=true
 ro.lenovo.single_hand=1
-ro.mot.build.customerid=global
 ro.support_one_handed_mode=true
 ro.vendor.paramfile.device=berlna
 ro.vendor.paramfile.special_device=berlna_global
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -213,6 +213,7 @@ vendor/lib64/com.qti.feature2.swmf.so

 # Camera - ICP
 vendor/firmware/CAMERA_ICP_170.elf
+vendor/firmware/CAMERA_ICP.elf

 # Camera - Motorola
 vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service
@@ -245,6 +246,12 @@ vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.
 vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml
 vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml

+# Fingerprint - configs
+vendor/usr/idc/uinput-egis.idc
+vendor/usr/idc/uinput_nav.idc
+vendor/usr/keylayout/uinput-egis.kl
+vendor/usr/keylayout/uinput_nav.kl
+
 # Fingerprint (goodix)
 vendor/lib64/hw/fingerprint.goodix.default.so
 vendor/lib64/libgf_ca.so
@@ -264,43 +271,11 @@ product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoog
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar

-# MotCamera3
-product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED
-product/etc/init/init.motcamera3.lens.rc
-product/etc/permissions/com.motorola.camera3.content.ai.xml
-product/etc/permissions/com.motorola.camera3.lens.xml
-product/etc/permissions/com.motorola.camera3.xml
-product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
-product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
-product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
-product/priv-app/MotCamera4/MotCamera4.apk|09bfcf8cc5e7f42ad781e38b71dc4e2077b60388
-system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
-system/etc/permissions/com.motorola.frameworks.core.addon.xml
-system/etc/permissions/com.motorola.motosignature.xml
-system/etc/permissions/moto-checkin.xml
-system/etc/permissions/moto-core_services.xml
-system/etc/permissions/moto-settings.xml
-system/framework/com.motorola.frameworks.core.addon.jar
-system/framework/com.motorola.motosignature.jar
-system/framework/moto-checkin.jar
-system/framework/moto-core_services.jar
-system/framework/moto-settings.jar
-system_ext/bin/motsettings
-system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
-
-# Moto Permissions
-product/etc/permissions/com.motorola.camera3.berlna.xml:vendor/etc/permissions/com.motorola.camera3.berlna.xml
-product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml
-product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml
-product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml
-product/etc/permissions/com.motorola.moto-uirefresh.xml
-product/etc/permissions/com.motorola.motodisplay.xml
-product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
-
 # NFC
 vendor/bin/STFlashTool

 # NFC - configs
+vendor/etc/init/hw/init.vendor.st21nfc.rc
 vendor/etc/libnfc-hal-st.conf
 vendor/etc/libnfc-nci-st.conf
 vendor/etc/st21nfc_conf_ds.txt
@@ -390,52 +365,3 @@ vendor/firmware/novatek_ts-NT36675-21061805-603a-berlna.bin:recovery/root/vendor
 # Vibrator firmware
 vendor/firmware/aw8695_haptic.bin
 vendor/firmware/aw8695_rtp.bin
-vendor/firmware/aw8695_rtp_Argo_Navis.bin
-vendor/firmware/aw8695_rtp_Attentive.bin
-vendor/firmware/aw8695_rtp_Awake.bin
-vendor/firmware/aw8695_rtp_Bird_Loop.bin
-vendor/firmware/aw8695_rtp_Brilliant_Times.bin
-vendor/firmware/aw8695_rtp_Chimey_Phone.bin
-vendor/firmware/aw8695_rtp_City_Lights.bin
-vendor/firmware/aw8695_rtp_Complex.bin
-vendor/firmware/aw8695_rtp_Crazy_Dream.bin
-vendor/firmware/aw8695_rtp_Curve_Ball_Blend.bin
-vendor/firmware/aw8695_rtp_Digital_Phone.bin
-vendor/firmware/aw8695_rtp_Electrovision.bin
-vendor/firmware/aw8695_rtp_Ether_Shake.bin
-vendor/firmware/aw8695_rtp_Fateful_Words.bin
-vendor/firmware/aw8695_rtp_Firefly.bin
-vendor/firmware/aw8695_rtp_Flutey_Phone.bin
-vendor/firmware/aw8695_rtp_Future_Funk.bin
-vendor/firmware/aw8695_rtp_Future_Hi_Tech.bin
-vendor/firmware/aw8695_rtp_Girtab.bin
-vendor/firmware/aw8695_rtp_Hello.bin
-vendor/firmware/aw8695_rtp_Hexagon.bin
-vendor/firmware/aw8695_rtp_Hydra.bin
-vendor/firmware/aw8695_rtp_Insert_Coin.bin
-vendor/firmware/aw8695_rtp_Jumping_Dots.bin
-vendor/firmware/aw8695_rtp_Keys.bin
-vendor/firmware/aw8695_rtp_Loopy.bin
-vendor/firmware/aw8695_rtp_Loopy_Lounge.bin
-vendor/firmware/aw8695_rtp_Modular.bin
-vendor/firmware/aw8695_rtp_Momentum.bin
-vendor/firmware/aw8695_rtp_Morning.bin
-vendor/firmware/aw8695_rtp_Moto.bin
-vendor/firmware/aw8695_rtp_Natural.bin
-vendor/firmware/aw8695_rtp_New_Player.bin
-vendor/firmware/aw8695_rtp_Now_or_Never.bin
-vendor/firmware/aw8695_rtp_Onward.bin
-vendor/firmware/aw8695_rtp_Organ_Dub.bin
-vendor/firmware/aw8695_rtp_Overclocked.bin
-vendor/firmware/aw8695_rtp_Pegasus.bin
-vendor/firmware/aw8695_rtp_Play.bin
-vendor/firmware/aw8695_rtp_Pyxis.bin
-vendor/firmware/aw8695_rtp_Regrade.bin
-vendor/firmware/aw8695_rtp_Scarabaeus.bin
-vendor/firmware/aw8695_rtp_Sceptrum.bin
-vendor/firmware/aw8695_rtp_Simple.bin
-vendor/firmware/aw8695_rtp_Solarium.bin
-vendor/firmware/aw8695_rtp_Sparse.bin
-vendor/firmware/aw8695_rtp_Terrabytes.bin
-vendor/firmware/aw8695_rtp_Verizon_Airwaves.bin
-vendor/firmware/aw8695_rtp_Zero_Hour.bin
--- a/proprietary-firmware.txt
+++ b/proprietary-firmware.txt
@@ -1,4 +1,21 @@
 # Firmware - from berlna_global-user 13 T1RMS33.1-110-17-12 f7bcd-35c05 release-keys - RETUS variant - (factory image).

-BTFM.bin:bluetooth.img;AB|f03693c9c493e89587f564a22d374ca8caf20559
+abl.elf:abl.img;AB
+aop.mbn:aop.img;AB
+BTFM.bin:bluetooth.img;AB
+cpucp.elf:cpucp.img;AB
+devcfg.mbn:devcfg.img;AB
 dspso.bin:dsp.img;AB
+fsg.mbn:fsg.img;AB
+hyp.mbn:hyp.img;AB
+keymaster.mbn:keymaster.img;AB
+logo.bin:logo.img;AB
+NON-HLOS.bin:modem.img;AB
+prov64.mbn:prov.img;AB
+qupfw.elf:qupfw.img;AB
+shrm.elf:shrm.img;AB
+storsec.mbn:storsec.img;AB
+tz.mbn:tz.img;AB
+uefi_sec.mbn:uefisecapp.img;AB
+xbl.elf:xbl.img;AB
+xbl_config.elf:xbl_config.img;AB
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -272,6 +272,10 @@
         non-zero. -->
    <integer name="config_defaultPeakRefreshRate">120</integer>

+    <!-- Default refresh rate in the zone defined by brightness and ambient thresholds.
+         If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->
+    <integer name="config_defaultRefreshRateInZone">90</integer>
+
    <!-- Default component for QR code scanner -->
    <string name="config_defaultQrCodeComponent" translatable="false">com.motorola.camera3/com.motorola.camera.Camera</string>
 </resources>
--- a/resource-overlay/device/Settings/res/values/config.xml
+++ b/resource-overlay/device/Settings/res/values/config.xml
@@ -6,4 +6,8 @@
 <resources>
    <!-- Whether to show a preference item for regulatory information in About phone -->
    <bool name="config_show_regulatory_info">true</bool>
+
+    <!-- Custom Maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Deivid Ignacio Parra (Deivid21)</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://www.paypal.com/paypalme/Deivid21</string>
 </resources>
Author	SHA1	Message	Date
Deivid21	d0bc83d6df	berlna: Move nfc config to vendor Change-Id: If0db1fecd8a2d415073d75ef3df79ad4d4a6d8c4	2025-09-18 01:34:33 -03:00
Deivid21	c0bdab0d50	berlna: Add missing Camera ICP firmware Change-Id: I49b924a8d2e4cbd02c78d0a23ca3134b1718684e	2025-09-18 01:09:34 -03:00
Deivid21	96a9a331b9	berlna: Drop unused vibrator firmware Change-Id: I3db152097bf4aa13fd08c6919de7fe6fd402e7c3	2025-09-18 00:57:38 -03:00
Deivid21	c9ec535467	berlna: overlay: Set defaultRefreshRateInZone config in 90 Hz Change-Id: I968dd2d9db216c8ebb6fd608ec2dc099809dc274	2025-09-12 00:53:25 -03:00
Deivid21	2245c2276f	berlna: overlay: Add Maintainer name string Change-Id: I5839441007dca957c31b4e21bd22143a0a34bb98	2025-09-12 00:27:25 -03:00
LuK1337	2449578723	berlna: Migrate to AIDL LiveDisplay HAL Change-Id: I4e8be836e94d442b40c63a1ac7dade3c9d9c784c	2025-09-12 00:10:51 -03:00
Deivid21	43ba50826a	berlna: Include a radio vendor device Change-Id: Id2c1eea2e70abf40379316a8291f8c33281d8de9	2025-08-09 03:14:53 -04:00
Deivid21	821393dd84	berlna: Track full firmware Change-Id: I8ff8a180017c63cfe141d7011c98244d2a11e95a	2025-08-09 02:55:23 -04:00
Deivid21	2dd105d201	berlna: Move fingerprint configs to vendor Change-Id: I022d8d840febe3795382250984e35cadeb457ce6	2025-08-07 21:47:30 -04:00
Deivid21	3fe6b1f185	berlna: Switch common name to sm8350 Change-Id: I8a02dfc326cc64f4855276a4a9c8091b194a28e4 Signed-off-by: Deivid21 <david.parra.ignacio@gmail.com>	2025-08-07 15:46:45 -04:00
Deivid21	3a0b83e424	berlna: Adjustments for Evolution X Change-Id: Ice600e83c6d73994475ac6352837d84f3773c136	2025-08-07 15:43:03 -04:00
Deivid21	416015a9f4	berlna: Build MotCamera4 from prebuilt source Change-Id: I43002182386d722334ea008b3fd190acbf4b6f3d Signed-off-by: Deivid21 <david.parra.ignacio@gmail.com>	2025-08-07 15:41:06 -04:00
Deivid21	9b4b5b5329	berlna: Drop Moto Stuff Change-Id: Id5f9efce40c7b5da9cbe6968a206ea153242dff4	2025-08-07 15:39:46 -04:00