waffle: Initial device tree conversion

Change-Id: Idc9631bcb25cf49e0defb793d18b08bdab431fa9
Signed-off-by: chandu078 <chandudyavanapelli03@gmail.com>
This commit is contained in:
chandu078
2024-11-06 11:46:00 +05:30
parent 5ac1d4fa69
commit 835ddbe299
10 changed files with 31 additions and 31 deletions

View File

@@ -1,8 +1,8 @@
# #
# Copyright (C) 2023 The LineageOS Project # Copyright (C) 2025 The LineageOS Project
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
PRODUCT_MAKEFILES := \ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_salami.mk $(LOCAL_DIR)/lineage_waffle.mk

View File

@@ -1,22 +1,22 @@
# #
# Copyright (C) 2021-2023 The LineageOS Project # Copyright (C) 2021-2025 The LineageOS Project
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
# Include the common OEM chipset BoardConfig. # Include the common OEM chipset BoardConfig.
include device/oneplus/sm8550-common/BoardConfigCommon.mk include device/oneplus/sm8650-common/BoardConfigCommon.mk
DEVICE_PATH := device/oneplus/salami DEVICE_PATH := device/oneplus/waffle
# Assert # Assert
TARGET_OTA_ASSERT_DEVICE := OP591BL1,OP594DL1 TARGET_OTA_ASSERT_DEVICE := OP5929L1,OP595DL1
# Display # Display
TARGET_SCREEN_DENSITY := 450 TARGET_SCREEN_DENSITY := 450
# Kernel # Kernel
TARGET_KERNEL_CONFIG += vendor/oplus/salami.config TARGET_KERNEL_CONFIG += vendor/oplus/waffle.config
# Properties # Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
@@ -25,4 +25,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 103 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 103
# Include the proprietary files BoardConfig. # Include the proprietary files BoardConfig.
include vendor/oneplus/salami/BoardConfigVendor.mk include vendor/oneplus/waffle/BoardConfigVendor.mk

View File

@@ -1 +1 @@
require board=kalama|OP591BL1|OP594DL1 require board=pineapple|OP5929L1|OP595DL1

View File

@@ -31,7 +31,7 @@ PRODUCT_SOONG_NAMESPACES += \
$(LOCAL_PATH) $(LOCAL_PATH)
# Inherit from the common OEM chipset makefile. # Inherit from the common OEM chipset makefile.
$(call inherit-product, device/oneplus/sm8550-common/common.mk) $(call inherit-product, device/oneplus/sm8650-common/common.mk)
# Inherit from the proprietary files makefile. # Inherit from the proprietary files makefile.
$(call inherit-product, vendor/oneplus/salami/salami-vendor.mk) $(call inherit-product, vendor/oneplus/waffle/waffle-vendor.mk)

View File

@@ -14,7 +14,7 @@ from extract_utils.main import (
) )
namespace_imports = [ namespace_imports = [
'vendor/oneplus/sm8550-common', 'vendor/oneplus/sm8650-common',
] ]
blob_fixups: blob_fixups_user_type = { blob_fixups: blob_fixups_user_type = {
@@ -23,7 +23,7 @@ blob_fixups: blob_fixups_user_type = {
} # fmt: skip } # fmt: skip
module = ExtractUtilsModule( module = ExtractUtilsModule(
'salami', 'waffle',
'oneplus', 'oneplus',
namespace_imports=namespace_imports, namespace_imports=namespace_imports,
blob_fixups=blob_fixups, blob_fixups=blob_fixups,
@@ -32,6 +32,6 @@ module = ExtractUtilsModule(
if __name__ == '__main__': if __name__ == '__main__':
utils = ExtractUtils.device_with_common( utils = ExtractUtils.device_with_common(
module, 'sm8550-common', module.vendor module, 'sm8650-common', module.vendor
) )
utils.run() utils.run()

View File

@@ -1,6 +1,6 @@
[ [
{ {
"repository": "android_device_oneplus_sm8550-common", "repository": "android_device_oneplus_sm8650-common",
"target_path": "device/oneplus/sm8550-common" "target_path": "device/oneplus/sm8650-common"
} }
] ]

View File

@@ -8,24 +8,24 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from salami device # Inherit from waffle device
$(call inherit-product, device/oneplus/salami/device.mk) $(call inherit-product, device/oneplus/waffle/device.mk)
# Inherit some common Lineage stuff. # Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk) $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
PRODUCT_NAME := lineage_salami PRODUCT_NAME := lineage_waffle
PRODUCT_DEVICE := salami PRODUCT_DEVICE := waffle
PRODUCT_MANUFACTURER := OnePlus PRODUCT_MANUFACTURER := OnePlus
PRODUCT_BRAND := OnePlus PRODUCT_BRAND := OnePlus
PRODUCT_MODEL := CPH2449 PRODUCT_MODEL := CPH2581
PRODUCT_GMS_CLIENTID_BASE := android-oneplus PRODUCT_GMS_CLIENTID_BASE := android-oneplus
PRODUCT_BUILD_PROP_OVERRIDES += \ PRODUCT_BUILD_PROP_OVERRIDES += \
BuildDesc="CPH2449EEA-user 15 TP1A.220905.001 T.R4T3.1c97c78-1_1 release-keys" \ BuildDesc="CPH2581EEA-user 15 AP3A.240617.008 U.R4T3.1c799fe_ca44_2 release-keys" \
BuildFingerprint=OnePlus/CPH2449EEA/OP594DL1:15/TP1A.220905.001/T.R4T3.1c97c78-1_1:user/release-keys \ BuildFingerprint=OnePlus/CPH2581EEA/OP595DL1:15/AP3A.240617.008/U.R4T3.1c799fe_ca44_2:user/release-keys \
DeviceName=OP594DL1 \ DeviceName=OP595DL1 \
DeviceProduct=CPH2449 \ DeviceProduct=CPH2581 \
SystemDevice=OP594DL1 \ SystemDevice=OP595DL1 \
SystemName=CPH2449 SystemName=CPH2581

View File

@@ -6,6 +6,6 @@
<resources> <resources>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL--> <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
<string name="def_device_name_simple" translatable="false">OnePlus 11 5G</string> <string name="def_device_name_simple" translatable="false">OnePlus 12</string>
</resources> </resources>

View File

@@ -213,7 +213,7 @@ odm/etc/sensor/config/kailua_mtp_pocket.json
odm/etc/sensor/config/kailua_mtp_sx933x_0.json odm/etc/sensor/config/kailua_mtp_sx933x_0.json
odm/etc/sensor/config/kailua_mtp_sx933x_down_0.json odm/etc/sensor/config/kailua_mtp_sx933x_down_0.json
odm/etc/sensor/config/lux_aod.json odm/etc/sensor/config/lux_aod.json
odm/etc/sensor/config/salami_qrd_ois_system.json odm/etc/sensor/config/waffle_qrd_ois_system.json
odm/etc/sensor/sensor_config.json odm/etc/sensor/sensor_config.json
# Touchscreen firmware # Touchscreen firmware

View File

@@ -1,9 +1,9 @@
# Bluetooth # Bluetooth
bluetooth.device.default_name=OnePlus 11 5G bluetooth.device.default_name=OnePlus 12
# Graphics # Graphics
ro.surface_flinger.set_idle_timer_ms=250 ro.surface_flinger.set_idle_timer_ms=250
ro.surface_flinger.set_touch_timer_ms=300 ro.surface_flinger.set_touch_timer_ms=300
# USB # USB
vendor.usb.product_string=OnePlus 11 5G vendor.usb.product_string=OnePlus 12