SDM660_64: Initial bring-up and compilation fix

Change-Id: I2cab738cf22cb3b83af4a993cf7985311538a98b
This commit is contained in:
Niranjan Reddy Dumbala 2017-03-17 19:54:32 +05:30 committed by Gerrit - the friendly Code Review server
parent ba549c4e0d
commit d10fc1160d
3 changed files with 37 additions and 18 deletions

View file

@ -118,6 +118,7 @@ include $(BUILD_PREBUILT)
$(shell mkdir -p $(TARGET_OUT_ETC)/firmware/wlan/qca_cld; \ $(shell mkdir -p $(TARGET_OUT_ETC)/firmware/wlan/qca_cld; \
ln -sf /system/etc/wifi/WCNSS_qcom_cfg.ini \ ln -sf /system/etc/wifi/WCNSS_qcom_cfg.ini \
$(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini) $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini)
endif
# Create symbolic links for msadp # Create symbolic links for msadp
$(shell mkdir -p $(TARGET_OUT_VENDOR)/firmware; \ $(shell mkdir -p $(TARGET_OUT_VENDOR)/firmware; \

View file

@ -19,8 +19,14 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := cortex-a53 TARGET_2ND_CPU_VARIANT := cortex-a53
# SDClang configuration ifeq ($(TARGET_USES_AOSP), true)
SDCLANG := true TARGET_HW_DISK_ENCRYPTION := false
else
# SDClang configuration
SDCLANG := true
#Enable HW based full disk encryption
TARGET_HW_DISK_ENCRYPTION := true
endif
TARGET_NO_BOOTLOADER := false TARGET_NO_BOOTLOADER := false
TARGET_USES_UEFI := true TARGET_USES_UEFI := true
@ -48,7 +54,10 @@ AB_OTA_PARTITIONS ?= boot system
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
TARGET_NO_RECOVERY := true TARGET_NO_RECOVERY := true
BOARD_USES_RECOVERY_AS_BOOT := true BOARD_USES_RECOVERY_AS_BOOT := true
TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm
ifneq ($(AB_OTA_UPDATER),true)
TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm
endif
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
BOARD_USERDATAIMAGE_PARTITION_SIZE := 48318382080 BOARD_USERDATAIMAGE_PARTITION_SIZE := 48318382080
@ -61,7 +70,7 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
TARGET_USES_ION := true TARGET_USES_ION := true
TARGET_USES_NEW_ION_API :=true TARGET_USES_NEW_ION_API :=true
TARGET_USES_QCOM_BSP :=true #TARGET_USES_QCOM_BSP :=true
ifeq ($(BOARD_KERNEL_CMDLINE),) ifeq ($(BOARD_KERNEL_CMDLINE),)
ifeq ($(TARGET_KERNEL_VERSION),4.4) ifeq ($(TARGET_KERNEL_VERSION),4.4)
@ -107,7 +116,7 @@ TARGET_COMPILE_WITH_MSM_KERNEL := true
TARGET_PD_SERVICE_ENABLED := true TARGET_PD_SERVICE_ENABLED := true
#Enable HW based full disk encryption #Enable HW based full disk encryption
TARGET_HW_DISK_ENCRYPTION := true #TARGET_HW_DISK_ENCRYPTION := true
TARGET_CRYPTFS_HW_PATH := device/qcom/common/cryptfs_hw TARGET_CRYPTFS_HW_PATH := device/qcom/common/cryptfs_hw
@ -141,4 +150,3 @@ TARGET_USES_IMS := true
#Add NON-HLOS files for ota upgrade #Add NON-HLOS files for ota upgrade
ADD_RADIO_FILES := true ADD_RADIO_FILES := true

View file

@ -1,9 +1,20 @@
DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay TARGET_USES_AOSP := true
TARGET_USES_QCOM_BSP := false
ifeq ($(TARGET_USES_AOSP),true)
TARGET_ENABLE_QC_AV_ENHANCEMENTS := false
TARGET_USES_QTIC := false
else
DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
TARGET_USES_QTIC := true
endif
TARGET_KERNEL_VERSION := 4.4 TARGET_KERNEL_VERSION := 4.4
BOARD_FRP_PARTITION_NAME := frp BOARD_FRP_PARTITION_NAME := frp
BOARD_HAVE_QCOM_FM := true BOARD_HAVE_QCOM_FM := false
#TARGET_USES_QTIC := false # bring-up hack TARGET_USES_NQ_NFC := false
TARGET_USES_NQ_NFC := true
ifeq ($(TARGET_USES_NQ_NFC),true) ifeq ($(TARGET_USES_NQ_NFC),true)
# Flag to enable and support NQ3XX chipsets # Flag to enable and support NQ3XX chipsets
NQ3XX_PRESENT := true NQ3XX_PRESENT := true
@ -12,7 +23,6 @@ endif
#QTIC flag #QTIC flag
-include $(QCPATH)/common/config/qtic-config.mk -include $(QCPATH)/common/config/qtic-config.mk
TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
# Video codec configuration files # Video codec configuration files
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true)
PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \ PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \
@ -43,20 +53,20 @@ ifneq (,$(strip $(wildcard $(PRODUCT_RENDERING_ENGINE_REVLIB))))
endif endif
# Enable features in video HAL that can compile only on this platform # Enable features in video HAL that can compile only on this platform
TARGET_USES_MEDIA_EXTENSIONS := true TARGET_USES_MEDIA_EXTENSIONS := false
# WLAN chipset # WLAN chipset
WLAN_CHIPSET := qca_cld3 WLAN_CHIPSET := qca_cld3
#Android EGL implementation #Android EGL implementation
PRODUCT_PACKAGES += libGLES_android PRODUCT_PACKAGES += libGLES_android
PRODUCT_BOOT_JARS += tcmiface #PRODUCT_BOOT_JARS += tcmiface
PRODUCT_BOOT_JARS += telephony-ext #PRODUCT_BOOT_JARS += telephony-ext
PRODUCT_PACKAGES += telephony-ext PRODUCT_PACKAGES += telephony-ext
ifneq ($(strip $(QCPATH)),) ifneq ($(strip $(QCPATH)),)
PRODUCT_BOOT_JARS += WfdCommon #PRODUCT_BOOT_JARS += WfdCommon
#Android oem shutdown hook #Android oem shutdown hook
PRODUCT_BOOT_JARS += oem-services PRODUCT_BOOT_JARS += oem-services
endif endif
@ -124,9 +134,9 @@ PRODUCT_PACKAGES += \
fs_config_files fs_config_files
# Add the overlay path # Add the overlay path
PRODUCT_PACKAGE_OVERLAYS := $(QCPATH)/qrdplus/Extension/res \ #PRODUCT_PACKAGE_OVERLAYS := $(QCPATH)/qrdplus/Extension/res \
$(QCPATH)/qrdplus/globalization/multi-language/res-overlay \ # $(QCPATH)/qrdplus/globalization/multi-language/res-overlay \
$(PRODUCT_PACKAGE_OVERLAYS) # $(PRODUCT_PACKAGE_OVERLAYS)
# Enable logdumpd service only for non-perf bootimage # Enable logdumpd service only for non-perf bootimage
ifeq ($(findstring perf,$(KERNEL_DEFCONFIG)),) ifeq ($(findstring perf,$(KERNEL_DEFCONFIG)),)