From 419a5b32d9b01bc084b7466e009603a44b2ea075 Mon Sep 17 00:00:00 2001 From: KakatkarAkshay Date: Sun, 18 Jul 2021 18:57:50 +0530 Subject: [PATCH] sm7250-common: Initial common device tree conversion --- Android.mk | 2 +- BoardConfigCommon.mk | 12 +++++----- bootctrl/Android.bp | 6 ++--- common.mk | 22 +++++++++---------- ..._codecs_kona.xml => media_codecs_lito.xml} | 0 ....xml => media_codecs_performance_lito.xml} | 0 ...files_kona.xml => media_profiles_lito.xml} | 0 gpt-utils/Android.bp | 2 +- setup-makefiles.sh | 2 +- ...na_8.ini => WCNSS_qcom_cfg_cta_lito_8.ini} | 0 10 files changed, 23 insertions(+), 23 deletions(-) rename configs/{media_codecs_kona.xml => media_codecs_lito.xml} (100%) rename configs/{media_codecs_performance_kona.xml => media_codecs_performance_lito.xml} (100%) rename configs/{media_profiles_kona.xml => media_profiles_lito.xml} (100%) rename wifi/qca6390/{WCNSS_qcom_cfg_cta_kona_8.ini => WCNSS_qcom_cfg_cta_lito_8.ini} (100%) diff --git a/Android.mk b/Android.mk index 130267f..fa5c4f9 100644 --- a/Android.mk +++ b/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter instantnoodle instantnoodlep kebab,$(TARGET_DEVICE)),) +ifneq ($(filter avicii ebba,$(TARGET_DEVICE)),) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 6d3e9bd..1b478e7 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -18,7 +18,7 @@ BUILD_BROKEN_DUP_RULES := true BOARD_VENDOR := oneplus -COMMON_PATH := device/oneplus/sm8250-common +COMMON_PATH := device/oneplus/sm7250-common # Architecture TARGET_ARCH := arm64 @@ -38,7 +38,7 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385 TARGET_USES_64_BIT_BINDER := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := kona +TARGET_BOOTLOADER_BOARD_NAME := lito TARGET_NO_BOOTLOADER := true # Kernel @@ -50,13 +50,13 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DTBO := true BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc OEM_TARGET_PRODUCT=$(PRODUCT_DEVICE) -TARGET_KERNEL_SOURCE := kernel/oneplus/sm8250 +TARGET_KERNEL_SOURCE := kernel/oneplus/sm7250 TARGET_KERNEL_CLANG_COMPILE := true -TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig +TARGET_KERNEL_CONFIG := vendor/lito-perf_defconfig # Platform BOARD_USES_QCOM_HARDWARE := true -TARGET_BOARD_PLATFORM := kona +TARGET_BOARD_PLATFORM := lito # Properties TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop @@ -205,4 +205,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # Inherit from the proprietary version --include vendor/oneplus/sm8250-common/BoardConfigVendor.mk +-include vendor/oneplus/sm7250-common/BoardConfigVendor.mk diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp index 4b298a3..10e9579 100644 --- a/bootctrl/Android.bp +++ b/bootctrl/Android.bp @@ -15,14 +15,14 @@ // cc_library { - name: "bootctrl.kona", + name: "bootctrl.lito", defaults: ["bootctrl_hal_defaults"], - static_libs: ["libgptutils.oneplus_kona"], + static_libs: ["libgptutils.oneplus_lito"], } cc_library_shared { name: "android.hardware.boot@1.1-impl-qti", stem: "android.hardware.boot@1.0-impl-1.1-qti", defaults: ["android.hardware.boot@1.1-impl-qti_defaults"], - static_libs: ["libgptutils.oneplus_kona"], + static_libs: ["libgptutils.oneplus_lito"], } diff --git a/common.mk b/common.mk index 724f99d..79cff51 100644 --- a/common.mk +++ b/common.mk @@ -21,7 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) # Get non-open-source specific aspects -$(call inherit-product, vendor/oneplus/sm8250-common/sm8250-common-vendor.mk) +$(call inherit-product, vendor/oneplus/sm7250-common/sm7250-common-vendor.mk) # Additional native libraries PRODUCT_COPY_FILES += \ @@ -122,10 +122,10 @@ PRODUCT_PACKAGES += \ android.hardware.soundtrigger@2.3-impl \ audio.a2dp.default \ audio.bluetooth.default \ - audio.primary.kona \ + audio.primary.lito \ audio.r_submix.default \ audio.usb.default \ - audio_amplifier.kona \ + audio_amplifier.lito \ liba2dpoffload \ libaudiopreprocessing \ libbatterylistener \ @@ -175,8 +175,8 @@ PRODUCT_PACKAGES += \ android.hardware.boot@1.1-impl-qti \ android.hardware.boot@1.1-impl-qti.recovery \ android.hardware.boot@1.1-service \ - bootctrl.kona \ - bootctrl.kona.recovery + bootctrl.lito \ + bootctrl.lito.recovery PRODUCT_PACKAGES_DEBUG += \ bootctl @@ -231,7 +231,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl-qti-display \ android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-service \ - gralloc.kona \ + gralloc.lito \ libdisplayconfig.qti \ libdisplayconfig.qti.vendor \ libqdMetaData \ @@ -239,7 +239,7 @@ PRODUCT_PACKAGES += \ libsdmutils \ libtinyxml \ libvulkan \ - memtrack.kona \ + memtrack.lito \ vendor.display.config@1.0 \ vendor.display.config@1.0.vendor \ vendor.display.config@1.1.vendor \ @@ -316,13 +316,13 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(LOCAL_PATH)/configs/media_codecs_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_kona.xml \ + $(LOCAL_PATH)/configs/media_codecs_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lito.xml \ $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media_codecs_performance_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_kona.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lito.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(LOCAL_PATH)/configs/media_profiles_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_kona.xml \ + $(LOCAL_PATH)/configs/media_profiles_lito.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lito.xml \ $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \ $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml @@ -485,7 +485,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg.ini \ - $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini \ + $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg_cta_lito_8.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg_cta_lito_8.ini \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg_roam.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg_roam.ini \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg_setchain.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg_setchain.ini \ $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ diff --git a/configs/media_codecs_kona.xml b/configs/media_codecs_lito.xml similarity index 100% rename from configs/media_codecs_kona.xml rename to configs/media_codecs_lito.xml diff --git a/configs/media_codecs_performance_kona.xml b/configs/media_codecs_performance_lito.xml similarity index 100% rename from configs/media_codecs_performance_kona.xml rename to configs/media_codecs_performance_lito.xml diff --git a/configs/media_profiles_kona.xml b/configs/media_profiles_lito.xml similarity index 100% rename from configs/media_profiles_kona.xml rename to configs/media_profiles_lito.xml diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index bdf3b04..09c669a 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -16,7 +16,7 @@ cc_library { - name: "libgptutils.oneplus_kona", + name: "libgptutils.oneplus_lito", vendor: true, recovery_available: true, shared_libs: [ diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 251dc57..ebcb636 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -25,7 +25,7 @@ source "${HELPER}" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true # Warning headers and guards -write_headers "instantnoodle instantnoodlep kebab" +write_headers "avicii ebba" # The standard common blobs write_makefiles "${MY_DIR}/proprietary-files.txt" true diff --git a/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini b/wifi/qca6390/WCNSS_qcom_cfg_cta_lito_8.ini similarity index 100% rename from wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini rename to wifi/qca6390/WCNSS_qcom_cfg_cta_lito_8.ini