From f6f44d0a4a708f25350ac9c57cf5023e0f85a725 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Wed, 13 Apr 2022 17:01:15 -0700 Subject: [PATCH] sm8250-common: Cleanup BoardConfig Change-Id: I44634e5fe539d1bff7b66e5154dba4d4321b7f08 --- BoardConfigCommon.mk | 124 +++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 444177f..cb5f5d6 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -17,63 +17,8 @@ BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true -BOARD_VENDOR := oneplus - COMMON_PATH := device/oneplus/sm8250-common -# Architecture -TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a -TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := generic -TARGET_CPU_VARIANT_RUNTIME := kryo385 - -TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv8-a -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := generic -TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385 - -# Bootloader -TARGET_BOOTLOADER_BOARD_NAME := kona -TARGET_NO_BOOTLOADER := true - -# Kernel -BOARD_BOOT_HEADER_VERSION := 2 -BOARD_KERNEL_BASE := 0x00000000 -BOARD_KERNEL_CMDLINE := \ - androidboot.console=ttyMSM0 \ - androidboot.hardware=qcom \ - androidboot.memcg=1 \ - androidboot.usbcontroller=a600000.dwc3 \ - cgroup.memory=nokmem,nosocket \ - loop.max_part=7 \ - lpm_levels.sleep_disabled=1 \ - msm_rtb.filter=0x237 \ - reboot=panic_warm \ - service_locator.enable=1 \ - swiotlb=2048 \ - video=vfb:640x400,bpp=32,memsize=3072000 -BOARD_KERNEL_IMAGE_NAME := Image -BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_SEPARATED_DTBO := true -BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) -TARGET_KERNEL_ADDITIONAL_FLAGS := BRAND_SHOW_FLAG=oneplus -TARGET_KERNEL_SOURCE := kernel/oneplus/sm8250 -TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig - -# Platform -BOARD_USES_QCOM_HARDWARE := true -TARGET_BOARD_PLATFORM := kona - -# Properties -TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop -TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop -TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/system_ext.prop -TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop - # A/B AB_OTA_UPDATER := true @@ -92,12 +37,22 @@ AB_OTA_PARTITIONS += \ # ANT+ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" +# Architecture +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_ABI := arm64-v8a +TARGET_CPU_VARIANT := generic +TARGET_CPU_VARIANT_RUNTIME := kryo385 + +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv8-a +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi +TARGET_2ND_CPU_VARIANT := generic +TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385 + # Audio -AUDIO_FEATURE_ENABLED_AHAL_EXT := false AUDIO_FEATURE_ENABLED_DLKM := true -AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false -AUDIO_FEATURE_ENABLED_DTS_EAGLE := false -AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := true AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true @@ -107,11 +62,15 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true AUDIO_FEATURE_ENABLED_SSR := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true -USE_CUSTOM_AUDIO_POLICY := 1 -# Camera -TARGET_USES_QTI_CAMERA_DEVICE := true -USE_DEVICE_SPECIFIC_CAMERA := true +# Bootloader +TARGET_BOOTLOADER_BOARD_NAME := kona + +# Properties +TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop +TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop +TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/system_ext.prop +TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop # Display TARGET_USES_COLOR_METADATA := true @@ -142,6 +101,34 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml +# Kernel +BOARD_BOOT_HEADER_VERSION := 2 +BOARD_KERNEL_BASE := 0x00000000 +BOARD_KERNEL_CMDLINE := \ + androidboot.console=ttyMSM0 \ + androidboot.hardware=qcom \ + androidboot.memcg=1 \ + androidboot.usbcontroller=a600000.dwc3 \ + cgroup.memory=nokmem,nosocket \ + loop.max_part=7 \ + lpm_levels.sleep_disabled=1 \ + msm_rtb.filter=0x237 \ + reboot=panic_warm \ + service_locator.enable=1 \ + swiotlb=2048 \ + video=vfb:640x400,bpp=32,memsize=3072000 +BOARD_KERNEL_IMAGE_NAME := Image +BOARD_KERNEL_PAGESIZE := 4096 +BOARD_KERNEL_SEPARATED_DTBO := true +BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) +TARGET_KERNEL_ADDITIONAL_FLAGS := BRAND_SHOW_FLAG=oneplus +TARGET_KERNEL_SOURCE := kernel/oneplus/sm8250 +TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig + +# Platform +BOARD_USES_QCOM_HARDWARE := true +TARGET_BOARD_PLATFORM := kona + # Metadata BOARD_USES_METADATA_PARTITION := true @@ -182,10 +169,10 @@ TARGET_USERIMAGES_USE_F2FS := true CUSTOM_APNS_FILE := $(COMMON_PATH)/configs/apns-conf.xml ENABLE_VENDOR_RIL_SERVICE := true -# Security patch level +# Security VENDOR_SECURITY_PATCH := 2022-07-05 -# Sepolicy +# SEPolicy include device/qcom/sepolicy_vndr/SEPolicy.mk include hardware/oplus/sepolicy/qti/SEPolicy.mk @@ -203,9 +190,8 @@ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 BOARD_WLAN_DEVICE := qcwcn BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -WIFI_DRIVER_DEFAULT := qca_cld3 +BOARD_WPA_SUPPLICANT_DRIVER := $(BOARD_HOSTAPD_DRIVER) +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := $(BOARD_HOSTAPD_PRIVATE_LIB) WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan" WIFI_DRIVER_STATE_OFF := "OFF" WIFI_DRIVER_STATE_ON := "ON" @@ -213,5 +199,5 @@ WIFI_HIDL_FEATURE_DUAL_INTERFACE := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X -# Inherit from the proprietary version +# Include the proprietary files BoardConfig. include vendor/oneplus/sm8250-common/BoardConfigVendor.mk