sm8650-common: Initial common device tree conversion

Change-Id: I36cce4575464b23f549c909de766645f8f23be78 Signed-off-by: chandu078 <chandudyavanapelli03@gmail.com>
2025-11-03 21:55:36 +08:00 · 2025-02-20 09:33:00 +05:30
parent 33855b4274
commit 399d365122
11 changed files with 64 additions and 64 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-COMMON_PATH := device/oneplus/sm8550-common
+COMMON_PATH := device/oneplus/sm8650-common

 # A/B
 AB_OTA_UPDATER := true
@@ -55,7 +55,7 @@ TARGET_PROVIDES_AUDIO_HAL := true
 TARGET_USES_QCOM_MM_AUDIO := true

 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := kalama
+TARGET_BOOTLOADER_BOARD_NAME := pineapple

 # Boot
 BOARD_BOOT_HEADER_VERSION := 4
@@ -89,8 +89,8 @@ DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := \
    $(COMMON_PATH)/manifest.xml \
    $(COMMON_PATH)/network_manifest.xml \
-    hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa.xml \
-    hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml
+    hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa.xml \
+    hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml

 ODM_MANIFEST_FILES := \
    $(COMMON_PATH)/manifest_odm.xml \
@@ -117,11 +117,11 @@ BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_IMAGE_NAME := Image

-TARGET_KERNEL_SOURCE := kernel/oneplus/sm8550
+TARGET_KERNEL_SOURCE := kernel/oneplus/sm8650
 TARGET_KERNEL_CONFIG := \
    gki_defconfig \
-    vendor/kalama_GKI.config \
-    vendor/oplus/kalama_GKI.config \
+    vendor/pineapple_GKI.config \
+    vendor/oplus/pineapple_GKI.config \
    vendor/debugfs.config

 # Kernel modules
@@ -134,7 +134,7 @@ BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(COMMO
 BOOT_KERNEL_MODULES := $(strip $(shell cat $(COMMON_PATH)/modules.load.recovery $(COMMON_PATH)/modules.include.vendor_ramdisk))
 SYSTEM_KERNEL_MODULES := $(strip $(shell cat $(COMMON_PATH)/modules.include.system_dlkm))

-TARGET_KERNEL_EXT_MODULE_ROOT := kernel/oneplus/sm8550-modules
+TARGET_KERNEL_EXT_MODULE_ROOT := kernel/oneplus/sm8650-modules
 TARGET_KERNEL_EXT_MODULES := \
 	qcom/opensource/mmrm-driver \
 	qcom/opensource/mm-drivers/hw_fence \
@@ -166,7 +166,7 @@ TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH := /sys/class/oplus_chg/battery/mmi

 # Platform
 BOARD_USES_QCOM_HARDWARE := true
-TARGET_BOARD_PLATFORM := kalama
+TARGET_BOARD_PLATFORM := pineapple

 # Metadata
 BOARD_USES_METADATA_PARTITION := true
@@ -274,4 +274,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X

 # Include the proprietary files BoardConfig.
-include vendor/oneplus/sm8550-common/BoardConfigVendor.mk
+include vendor/oneplus/sm8650-common/BoardConfigVendor.mk
--- a/common.mk
+++ b/common.mk
@@ -57,15 +57,15 @@ PRODUCT_PACKAGES += \
    libqcomvoiceprocessing \
    libsndcardparser \
    libvolumelistener \
-    sound_trigger.primary.kalama
+    sound_trigger.primary.pineapple

-AUDIO_HAL_DIR := hardware/qcom-caf/sm8550/audio/primary-hal
+AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal

 PRODUCT_COPY_FILES += \
    $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    $(AUDIO_HAL_DIR)/configs/kalama/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_effects.conf \
-    $(AUDIO_HAL_DIR)/configs/kalama/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_effects.xml \
-    $(AUDIO_HAL_DIR)/configs/kalama/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \
+    $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.conf \
+    $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.xml \
+    $(AUDIO_HAL_DIR)/configs/pineapple/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \
    $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \
    $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
    $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
@@ -174,7 +174,7 @@ PRODUCT_PACKAGES += \
    fstab.default.vendor_ramdisk \
    init.class_main.sh \
    init.kernel.post_boot.sh \
-    init.kernel.post_boot-kalama.sh \
+    init.kernel.post_boot-pineapple.sh \
    init.oplus.hw.rc \
    init.oplus.hw.rc.recovery \
    init.oplus.rc \
@@ -266,7 +266,7 @@ PRODUCT_PACKAGES += \
    android.hardware.power-service-qti

 PRODUCT_COPY_FILES += \
-    vendor/qcom/opensource/power/config/kalama/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
+    vendor/qcom/opensource/power/config/pineapple/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml

 # QTI fwk-detect
 PRODUCT_PACKAGES += \
@@ -301,8 +301,8 @@ PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
 PRODUCT_SOONG_NAMESPACES += \
    $(LOCAL_PATH) \
    hardware/oplus \
-    kernel/oneplus/sm8550 \
-    kernel/oneplus/sm8550-modules
+    kernel/oneplus/sm8650 \
+    kernel/oneplus/sm8650-modules

 # Storage
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
@@ -415,4 +415,4 @@ PRODUCT_PACKAGES += \
    firmware_WCNSS_qcom_cfg.ini_symlink

 # Inherit from the proprietary files makefile.
-$(call inherit-product, vendor/oneplus/sm8550-common/sm8550-common-vendor.mk)
+$(call inherit-product, vendor/oneplus/sm8650-common/sm8650-common-vendor.mk)
--- a/extract-files.py
+++ b/extract-files.py
@@ -19,8 +19,8 @@ from extract_utils.main import (
 )

 namespace_imports = [
-    'device/oneplus/sm8550-common',
-    'hardware/qcom-caf/sm8550',
+    'device/oneplus/sm8650-common',
+    'hardware/qcom-caf/sm8650',
    'hardware/qcom-caf/wlan',
    'hardware/oplus',
    'vendor/qcom/opensource/commonsys/display',
@@ -110,7 +110,7 @@ blob_fixups: blob_fixups_user_type = {
    'vendor/etc/libnfc-nxp.conf': blob_fixup()
        .regex_replace('(NXPLOG_.*_LOGLEVEL)=0x03', '\\1=0x02')
        .regex_replace('NFC_DEBUG_ENABLED=1', 'NFC_DEBUG_ENABLED=0'),
-    ('vendor/etc/media_codecs_kalama.xml', 'vendor/etc/media_codecs_kalama_vendor.xml'): blob_fixup()
+    ('vendor/etc/media_codecs_pineapple.xml', 'vendor/etc/media_codecs_pineapple_vendor.xml'): blob_fixup()
        .regex_replace('.*media_codecs_(google_audio|google_c2|google_telephony|google_video|vendor_audio).*\n', ''),
    'vendor/etc/seccomp_policy/qwesd@2.0.policy': blob_fixup()
        .add_line_if_missing('pipe2: 1'),
@@ -121,7 +121,7 @@ blob_fixups: blob_fixups_user_type = {
 }  # fmt: skip

 module = ExtractUtilsModule(
-    'sm8550-common',
+    'sm8650-common',
    'oneplus',
    blob_fixups=blob_fixups,
    lib_fixups=lib_fixups,
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -87,8 +87,8 @@ sh_binary {
 }

 sh_binary {
-    name: "init.kernel.post_boot-kalama.sh",
-    src: "init.kernel.post_boot-kalama.sh",
+    name: "init.kernel.post_boot-pineapple.sh",
+    src: "init.kernel.post_boot-pineapple.sh",
    vendor: true,
 }

--- a/init/init.kernel.post_boot.sh
+++ b/init/init.kernel.post_boot.sh
@@ -170,7 +170,7 @@ fi

 case "$platformid" in
 	"519"|"536"|"600"|"601"|"603"|"604")
-		/vendor/bin/sh /vendor/bin/init.kernel.post_boot-kalama.sh
+		/vendor/bin/sh /vendor/bin/init.kernel.post_boot-pineapple.sh
 		;;
 	*)
 		echo "***WARNING***: Invalid SoC ID\n\t No postboot settings applied!!\n"
--- a/init/init.target.rc
+++ b/init/init.target.rc
@@ -84,8 +84,8 @@ on fs
    mkdir /mnt/vendor/persist/secnvm 0770 system system
    mkdir /mnt/vendor/persist/data 0700 system system

-on property:ro.boot.product.vendor.sku=kalama
-    setprop ro.soc.model kalama
+on property:ro.boot.product.vendor.sku=pineapple
+    setprop ro.soc.model pineapple

 on post-fs
    # set RLIMIT_MEMLOCK to 64MB
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -4,15 +4,15 @@
    "target_path": "hardware/oplus"
  },
  {
-    "repository": "android_kernel_oneplus_sm8550",
-    "target_path": "kernel/oneplus/sm8550"
+    "repository": "android_kernel_oneplus_sm8650",
+    "target_path": "kernel/oneplus/sm8650"
  },
  {
-    "repository": "android_kernel_oneplus_sm8550-devicetrees",
-    "target_path": "kernel/oneplus/sm8550-devicetrees"
+    "repository": "android_kernel_oneplus_sm8650-devicetrees",
+    "target_path": "kernel/oneplus/sm8650-devicetrees"
  },
  {
-    "repository": "android_kernel_oneplus_sm8550-modules",
-    "target_path": "kernel/oneplus/sm8550-modules"
+    "repository": "android_kernel_oneplus_sm8650-modules",
+    "target_path": "kernel/oneplus/sm8650-modules"
  }
 ]
--- a/modules.load
+++ b/modules.load
@@ -13,8 +13,8 @@ pinctrl-spmi-gpio.ko
 pinctrl-spmi-mpp.ko
 pwm-qti-lpg.ko
 pci-msm-drv.ko
-debugcc-kalama.ko
-gpucc-kalama.ko
+debugcc-pineapple.ko
+gpucc-pineapple.ko
 bam_dma.ko
 msm_gpi.ko
 pdr_interface.ko
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -2,9 +2,9 @@ qcom_wdt_core.ko
 gh_virt_wdt.ko
 qcom_cpu_vendor_hooks.ko
 clk-rpmh.ko
-gcc-kalama.ko
+gcc-pineapple.ko
 icc-rpmh.ko
-camcc-kalama.ko
+camcc-pineapple.ko
 qcom_ipcc.ko
 qcom-pdc.ko
 thermal_minidump.ko
@@ -24,9 +24,9 @@ crypto-qti-hwkm.ko
 dcc_v2.ko
 dcvs_fp.ko
 device_info.ko
-dispcc-kalama.ko
-tcsrcc-kalama.ko
-videocc-kalama.ko
+dispcc-pineapple.ko
+tcsrcc-pineapple.ko
+videocc-pineapple.ko
 gdsc-regulator.ko
 gh_arm_drv.ko
 gh_ctrl.ko
@@ -46,11 +46,11 @@ mem_buf.ko
 memory_dump_v2.ko
 minidump.ko
 msm_dma_iommu_mapping.ko
-pinctrl-kalama.ko
-qnoc-kalama.ko
+pinctrl-pineapple.ko
+qnoc-pineapple.ko
 nvmem_qcom-spmi-sdam.ko
 phy-qcom-ufs.ko
-phy-qcom-ufs-qmp-v4-kalama.ko
+phy-qcom-ufs-qmp-v4-pineapple.ko
 phy-qcom-ufs-qrbtc-sdm845.ko
 pinctrl-msm.ko
 proxy-consumer.ko
@@ -119,8 +119,8 @@ pinctrl-spmi-gpio.ko
 pinctrl-spmi-mpp.ko
 pwm-qti-lpg.ko
 pci-msm-drv.ko
-debugcc-kalama.ko
-gpucc-kalama.ko
+debugcc-pineapple.ko
+gpucc-pineapple.ko
 bam_dma.ko
 msm_gpi.ko
 pdr_interface.ko
--- a/modules.load.vendor_boot
+++ b/modules.load.vendor_boot
@@ -2,9 +2,9 @@ qcom_wdt_core.ko
 gh_virt_wdt.ko
 qcom_cpu_vendor_hooks.ko
 clk-rpmh.ko
-gcc-kalama.ko
+gcc-pineapple.ko
 icc-rpmh.ko
-camcc-kalama.ko
+camcc-pineapple.ko
 qcom_ipcc.ko
 qcom-pdc.ko
 thermal_minidump.ko
@@ -24,9 +24,9 @@ crypto-qti-hwkm.ko
 dcc_v2.ko
 dcvs_fp.ko
 device_info.ko
-dispcc-kalama.ko
-tcsrcc-kalama.ko
-videocc-kalama.ko
+dispcc-pineapple.ko
+tcsrcc-pineapple.ko
+videocc-pineapple.ko
 gdsc-regulator.ko
 gh_arm_drv.ko
 gh_ctrl.ko
@@ -46,11 +46,11 @@ mem_buf.ko
 memory_dump_v2.ko
 minidump.ko
 msm_dma_iommu_mapping.ko
-pinctrl-kalama.ko
-qnoc-kalama.ko
+pinctrl-pineapple.ko
+qnoc-pineapple.ko
 nvmem_qcom-spmi-sdam.ko
 phy-qcom-ufs.ko
-phy-qcom-ufs-qmp-v4-kalama.ko
+phy-qcom-ufs-qmp-v4-pineapple.ko
 phy-qcom-ufs-qrbtc-sdm845.ko
 pinctrl-msm.ko
 proxy-consumer.ko
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -117,7 +117,7 @@ odm/lib64/libtfa98xx.so
 vendor/etc/models/acd/event.eai
 vendor/etc/models/acd/music.eai
 vendor/etc/models/acd/speech.eai
-vendor/lib64/hw/audio.primary.kalama.so
+vendor/lib64/hw/audio.primary.pineapple.so
 vendor/lib64/libAlacSwDec.so
 vendor/lib64/libApeSwDec.so
 vendor/lib64/libEvrcSwCodec.so
@@ -1238,7 +1238,7 @@ vendor/lib64/com.qti.feature2.derivedoffline.so
 vendor/lib64/com.qti.feature2.frameselect.so
 vendor/lib64/com.qti.feature2.fusion.so
 vendor/lib64/com.qti.feature2.generic.so
-vendor/lib64/com.qti.feature2.gs.sm8550.so
+vendor/lib64/com.qti.feature2.gs.sm8650.so
 vendor/lib64/com.qti.feature2.hdr.so
 vendor/lib64/com.qti.feature2.mcreprocrt.so
 vendor/lib64/com.qti.feature2.memcpy.so
@@ -1253,7 +1253,7 @@ vendor/lib64/com.qti.feature2.serializer.so
 vendor/lib64/com.qti.feature2.swmf.so
 vendor/lib64/com.qti.qseeaon.so
 vendor/lib64/com.qti.qseeutils.so
-vendor/lib64/com.qti.settings.sm8550.so
+vendor/lib64/com.qti.settings.sm8650.so
 vendor/lib64/com.qti.stats.common.so
 vendor/lib64/com.qualcomm.mcx.distortionmapper.so
 vendor/lib64/com.qualcomm.mcx.linearmapper.so
@@ -2031,14 +2031,14 @@ vendor/bin/init.qti.media.sh
 vendor/etc/init/init.qti.media.rc
 vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
 vendor/etc/init/vendor.qti.media.c2audio@1.0-service.rc
-vendor/etc/media_codecs_kalama.xml
-vendor/etc/media_codecs_kalama_vendor.xml
-vendor/etc/media_codecs_performance_kalama.xml
-vendor/etc/media_codecs_performance_kalama_vendor.xml
-vendor/etc/media_kalama/video_system_specs.json
+vendor/etc/media_codecs_pineapple.xml
+vendor/etc/media_codecs_pineapple_vendor.xml
+vendor/etc/media_codecs_performance_pineapple.xml
+vendor/etc/media_codecs_performance_pineapple_vendor.xml
+vendor/etc/media_pineapple/video_system_specs.json
 vendor/etc/media_profiles.xml
 vendor/etc/media_profiles_V1_0.xml
-vendor/etc/media_profiles_kalama.xml
+vendor/etc/media_profiles_pineapple.xml
 vendor/etc/media_profiles_vendor.xml
 vendor/etc/seccomp_policy/codec2.vendor.base-arm64.policy
 vendor/etc/seccomp_policy/codec2.vendor.ext-arm64.policy