From 65a7703125b5778aa73075ecbe0302ec6cb14755 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 11 Feb 2018 23:30:12 +0000 Subject: msm8996-common: Split vendor specific and system props Change-Id: Ib1a490d2d8f23ca832af915b6af783cad6dcdf17 --- BoardConfigCommon.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 21d35ab..e645e1a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -36,7 +36,8 @@ TARGET_BOARD_PLATFORM := msm8996 TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 # Properties -TARGET_SYSTEM_PROP += $(VENDOR_PATH)/system.prop +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop # Architecture TARGET_ARCH := arm64 -- cgit v1.2.3 From f39082c259630939f16ae5a554384a1415535f29 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Wed, 31 Jan 2018 16:17:03 +0000 Subject: msm8996-common: Build a vendor image * Turn the partition /factory into something more useful for us. Change-Id: I32a3088ef7803d3db691b9031dda2dbe55565ba3 --- BoardConfigCommon.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e645e1a..63c5917 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -171,7 +171,10 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_USERDATAIMAGE_PARTITION_SIZE := 58132761600 -BOARD_FLASH_BLOCK_SIZE := 262144 +BOARD_VENDORIMAGE_PARTITION_SIZE := 390029312 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) +TARGET_COPY_OUT_VENDOR := vendor # QCOM hardware BOARD_USES_QCOM_HARDWARE := true -- cgit v1.2.3 From 2dc1a7bc0c5a382adf9a2ae12b9fd38f21993348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 23:34:08 +0100 Subject: msm8996-common: Use ext4 for system image. * It's the only fs allowed for system. --- BoardConfigCommon.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 63c5917..edbedfb 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -170,6 +170,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USERDATAIMAGE_PARTITION_SIZE := 58132761600 BOARD_VENDORIMAGE_PARTITION_SIZE := 390029312 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -- cgit v1.2.3 From d1db139ac0bab3d0a9c47596d618cc16b4ae7a4c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 27 Feb 2018 20:00:45 +0000 Subject: msm8996-common: Get rid of recovery-only fstab * Mounting /system and /vendor partitions is handled in kernel now, however removing the entries from fstab caused issues building the OTA. The workaround was to have a separate fstab, but turns out that simply setting the recoveryonly flag does the trick because those are then ignored during a normal Android boot. Change-Id: I2944384d0a1c41bc9f9f51e2e29daff2bed0a0f4 --- BoardConfigCommon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index edbedfb..113d6b5 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -184,7 +184,7 @@ BOARD_USES_QCOM_HARDWARE := true TARGET_HAS_NO_WIFI_STATS := true # Recovery -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.full +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true -- cgit v1.2.3 From f7f5053a737cffc4ce651371eadfe493619281a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 10:31:05 +0100 Subject: msm8996-common: Reorganize BoardConfigCommon.mk * And move telephony-ext to msm8996.mk. --- BoardConfigCommon.mk | 103 +++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 60 deletions(-) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 113d6b5..382d480 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -13,32 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -# -# This file sets variables that control the way modules are built -# thorughout the system. It should not be used to conditionally -# disable makefiles (the proper mechanism to control what gets -# included in a build is to use PRODUCT_PACKAGES in a product -# definition file). -# +BOARD_VENDOR := zuk VENDOR_PATH := device/zuk/msm8996-common TARGET_SPECIFIC_HEADER_PATH := $(VENDOR_PATH)/include -BOARD_VENDOR := zuk - -# Bootloader -TARGET_BOOTLOADER_BOARD_NAME := msm8996 -TARGET_NO_BOOTLOADER := true - -# Platform -TARGET_BOARD_PLATFORM := msm8996 -TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 - -# Properties -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop - # Architecture TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a @@ -54,20 +34,31 @@ TARGET_2ND_CPU_VARIANT := kryo TARGET_USES_64_BIT_BINDER := true +# Bootloader +TARGET_BOOTLOADER_BOARD_NAME := msm8996 +TARGET_NO_BOOTLOADER := true + # Kernel -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff BOARD_KERNEL_BASE := 0x80000000 +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff +BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 -BOARD_RAMDISK_OFFSET := 0x01000000 -BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb +BOARD_RAMDISK_OFFSET := 0x01000000 TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_HEADER_ARCH := arm64 -TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android- TARGET_KERNEL_SOURCE := kernel/zuk/msm8996 +TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android- + +# Platform +TARGET_BOARD_PLATFORM := msm8996 +TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 + +# Properties +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop # Audio -AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true AUDIO_FEATURE_ENABLED_ANC_HEADSET := true AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true @@ -78,11 +69,12 @@ AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true AUDIO_FEATURE_ENABLED_FLUENCE := true AUDIO_FEATURE_ENABLED_HFP := true AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true +AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true -AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true +AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true BOARD_USES_ALSA_AUDIO := true USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 @@ -97,8 +89,9 @@ QCOM_BT_USE_BTNV := true # Camera BOARD_QTI_CAMERA_32BIT_ONLY := true -USE_DEVICE_SPECIFIC_CAMERA := true TARGET_SUPPORT_HAL1 := false +TARGET_USES_MEDIA_EXTENSIONS := true +USE_DEVICE_SPECIFIC_CAMERA := true # Charger BOARD_CHARGER_ENABLE_SUSPEND := true @@ -107,10 +100,6 @@ BOARD_CHARGER_DISABLE_INIT_BLANK := true # CNE and DPM BOARD_USES_QCNE := true -# Crypto -TARGET_HW_DISK_ENCRYPTION := true -TARGET_KEYMASTER_WAIT_FOR_QSEE := true - # Dex ifeq ($(HOST_OS),linux) ifneq ($(TARGET_BUILD_VARIANT),eng) @@ -122,21 +111,27 @@ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true # Display BOARD_USES_ADRENO := true TARGET_CONTINUOUS_SPLASH_ENABLED := true +MAX_VIRTUAL_DISPLAY_DIMENSION := 4096 +TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true TARGET_USES_C2D_COMPOSITION := true -TARGET_USES_ION := true -TARGET_USES_NEW_ION_API :=true TARGET_USES_GRALLOC1 := true TARGET_USES_HWC2 := true +TARGET_USES_ION := true +TARGET_USES_NEW_ION_API :=true TARGET_USES_OVERLAY := true USE_OPENGL_RENDERER := true MAX_EGL_CACHE_KEY_SIZE := 12*1024 MAX_EGL_CACHE_SIZE := 2048*1024 -OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so -MAX_VIRTUAL_DISPLAY_DIMENSION := 4096 -TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true + +OVERRIDE_RS_DRIVER := libRSDriver_adreno.so + VSYNC_EVENT_PHASE_OFFSET_NS := 2000000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000 +# Encryption +TARGET_HW_DISK_ENCRYPTION := true +TARGET_KEYMASTER_WAIT_FOR_QSEE := true + # Filesystem TARGET_FS_CONFIG_GEN := $(VENDOR_PATH)/config.fs @@ -146,25 +141,20 @@ BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true TARGET_NO_RPC := true USE_DEVICE_SPECIFIC_GPS := true -# Hidl manifests +# HIDL DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml DEVICE_MATRIX_FILE := $(VENDOR_PATH)/compatibility_matrix.xml # Init -TARGET_INIT_VENDOR_LIB := libinit_msm8996 -TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8996 TARGET_PLATFORM_DEVICE_BASE := /devices/soc/ # Lineage Hardware BOARD_HARDWARE_CLASS += \ $(VENDOR_PATH)/lineagehw -# Keystore +# Keymaster TARGET_PROVIDES_KEYMASTER := true -# Media -TARGET_USES_MEDIA_EXTENSIONS := true - # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 @@ -177,11 +167,13 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) TARGET_COPY_OUT_VENDOR := vendor -# QCOM hardware -BOARD_USES_QCOM_HARDWARE := true - -# QCOM Power +# Power TARGET_HAS_NO_WIFI_STATS := true +TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on" + +# QCOM +BOARD_USES_QCOM_HARDWARE := true +TARGET_USE_SDCLANG := true # Recovery TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom @@ -196,18 +188,9 @@ TARGET_RIL_VARIANT := caf include device/qcom/sepolicy/sepolicy.mk BOARD_SEPOLICY_DIRS += $(VENDOR_PATH)/sepolicy -# Tap to wake node -TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on" - -# Telephony -PRODUCT_PACKAGES += \ - telephony-ext - -PRODUCT_BOOT_JARS += \ - telephony-ext - -# Use Snapdragon LLVM, if available -TARGET_USE_SDCLANG := true +# Vendor init +TARGET_INIT_VENDOR_LIB := libinit_msm8996 +TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8996 # Wifi BOARD_HAS_QCOM_WLAN := true -- cgit v1.2.3 From 506b1dd4075e0a61cdceb50672ab3b445426226d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 11:37:21 +0100 Subject: msm8996-common: Enable TARGET_PROVIDES_LIBLIGHT by default. --- BoardConfigCommon.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'BoardConfigCommon.mk') diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 382d480..6a2abcd 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -155,6 +155,9 @@ BOARD_HARDWARE_CLASS += \ # Keymaster TARGET_PROVIDES_KEYMASTER := true +# Lights +TARGET_PROVIDES_LIBLIGHT := true + # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 -- cgit v1.2.3