diff --git a/PlatformConfig.mk b/PlatformConfig.mk index ffd2a4a..47133c2 100644 --- a/PlatformConfig.mk +++ b/PlatformConfig.mk @@ -3,7 +3,6 @@ TARGET_BOARD_PLATFORM := mt6753 TARGET_BOOTLOADER_BOARD_NAME := mt6735 TARGET_NO_BOOTLOADER := true -TARGET_NO_FACTORYIMAGE := true # CPU TARGET_ARCH := arm64 @@ -11,8 +10,6 @@ TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := cortex-a53 -TARGET_CPU_SMP := true -TARGET_CPU_CORTEX_A53 := true TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv7-a-neon @@ -21,9 +18,7 @@ TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := cortex-a53 # Architecture Extensions -TARGET_CPU_SMP := true ARCH_ARM_HAVE_NEON := true -ARCH_ARM_HAVE_TLS_REGISTER := true ARCH_ARM_HAVE_VFP := true # Partitions @@ -35,6 +30,5 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 419430400 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 131072 -BOARD_HAS_LARGE_FILESYSTEM := true TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/board/audio.mk b/board/audio.mk index 1decbfe..a91e587 100644 --- a/board/audio.mk +++ b/board/audio.mk @@ -1,6 +1,3 @@ -# Audio -TARGET_CPU_MEMCPY_OPT_DISABLE := true - # Audio config PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/configs/audio/audio_policy.conf:system/etc/audio_policy.conf \ diff --git a/board/common.mk b/board/common.mk index 5633b91..1d73001 100644 --- a/board/common.mk +++ b/board/common.mk @@ -2,9 +2,6 @@ BOARD_USES_CYANOGEN_HARDWARE := true BOARD_HARDWARE_CLASS := $(DEVICE_PATH)/cmhw/ -# faster Bootanimation -TARGET_BOOTANIMATION_HALF_RES := true - #system.prop TARGET_SYSTEM_PROP := $(DEVICE_PATH)/system.prop diff --git a/board/display.mk b/board/display.mk index 0806348..3fa3661 100644 --- a/board/display.mk +++ b/board/display.mk @@ -1,16 +1,13 @@ # Display -USE_OPENGL_RENDERER := true TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true MAX_VIRTUAL_DISPLAY_DIMENSION := 1 -MTK_HWC_SUPPORT := yes -MTK_HWC_VERSION := 1.4.1 TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true BOARD_EGL_CFG := $(DEVICE_PATH)/configs/egl.cfg # Resolution TARGET_SCREEN_HEIGHT := 1920 TARGET_SCREEN_WIDTH := 1080 -TARGET_BOOTANIMATION_HALF_RES := true # Bootanimation TARGET_BOOTANIMATION_NAME := 1080 +TARGET_BOOTANIMATION_HALF_RES := true diff --git a/board/kernel.mk b/board/kernel.mk index adc8785..4b14f2c 100644 --- a/board/kernel.mk +++ b/board/kernel.mk @@ -1,6 +1,4 @@ # Kernel -TARGET_BOARD_SUFFIX := _64 -TARGET_USES_64_BIT_BINDER := true TARGET_IS_64_BIT := true BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2 @@ -12,12 +10,8 @@ BOARD_TAGS_OFFSET := 0x0df88000 BOARD_KERNEL_PAGESIZE := 2048 BOARD_MKBOOTIMG_ARGS := --board $(BOARD_NAME) --kernel_offset $(BOARD_KERNEL_OFFSET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_TAGS_OFFSET) --second_offset 0x00e88000 -MTK_APPENDED_DTB_SUPPORT := yes - # Kernel properties TARGET_KERNEL_SOURCE := kernel/meizu/m2note TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_HEADER_ARCH := arm64 TARGET_KERNEL_CONFIG := m2note_defconfig -MTK_APPENDED_DTB_SUPPORT := yes -BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb diff --git a/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java b/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java index 55fca56..8753cc5 100644 --- a/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java +++ b/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java @@ -26,11 +26,11 @@ public class DisplayColorCalibration { return FileUtils.isFileWritable(COLOR_FILE); } - public static int getMaxValue() { + public static int getMaxValue() { return 2000; } - public static int getMinValue() { + public static int getMinValue() { return 0; } @@ -38,7 +38,7 @@ public class DisplayColorCalibration { return getMaxValue(); } - public static String getCurColors() { + public static String getCurColors() { return FileUtils.readOneLine(COLOR_FILE); } diff --git a/cmhw/org/cyanogenmod/hardware/KeyDisabler.java b/cmhw/org/cyanogenmod/hardware/KeyDisabler.java index b101869..1304f00 100644 --- a/cmhw/org/cyanogenmod/hardware/KeyDisabler.java +++ b/cmhw/org/cyanogenmod/hardware/KeyDisabler.java @@ -17,6 +17,7 @@ package org.cyanogenmod.hardware; import android.util.Log; + /* * Disable capacitive keys * @@ -54,5 +55,4 @@ public class KeyDisabler { Log.i("KeyDisabler", "setActive " + state); return isActive; } - } diff --git a/cmhw/org/cyanogenmod/hardware/VibratorHW.java b/cmhw/org/cyanogenmod/hardware/VibratorHW.java index 6d50152..c038f4a 100644 --- a/cmhw/org/cyanogenmod/hardware/VibratorHW.java +++ b/cmhw/org/cyanogenmod/hardware/VibratorHW.java @@ -43,24 +43,24 @@ public class VibratorHW { return true; } - public static boolean setIntensity(int intensity) { + public static boolean setIntensity(int intensity) { return FileUtils.writeLine(INTENSITY_FILE, Integer.toString(intensity)); } - public static int getMaxIntensity() { + public static int getMaxIntensity() { return 7; } - public static int getMinIntensity() { + public static int getMinIntensity() { return 0; } - public static int getWarningThreshold() { + public static int getWarningThreshold() { // actually this is rather arbitrary return 7; } - public static int getCurIntensity() { + public static int getCurIntensity() { final String result = FileUtils.readOneLine(INTENSITY_FILE); if (result == null) { return 5; @@ -73,7 +73,7 @@ public class VibratorHW { } } - public static int getDefaultIntensity() { + public static int getDefaultIntensity() { return 5; } }