Merge "Remove legacy flags, add M kernel/dtb, use LZMA" into android-6.0

BoardConfig.mk

@@ -21,7 +21,7 @@ TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_SMP := true
 ARCH_ARM_HAVE_TLS_REGISTER := true
 
-BOARD_KERNEL_CMDLINE :=  console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F
+BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom androidboot.bootdevice=msm_sdcc.1 user_debug=31 msm_rtb.filter=0x3F
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01E00000
@@ -33,8 +33,13 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x2E59F7C00 # 0x2E59FBC00 - 16384 (footer)
 BOARD_CACHEIMAGE_PARTITION_SIZE    := 0x00C800000
 BOARD_FLASH_BLOCK_SIZE := 131072
 
-TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage
-TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img
+ifdef KLTE_MARSHMALLOW
+	TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage-M
+	TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img-M
+else
+	TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage-L
+	TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img-L
+endif
 
 # Use this flag if the board has a ext4 partition larger than 2gb
 BOARD_HAS_LARGE_FILESYSTEM := true
@@ -47,28 +52,25 @@ BOARD_CUSTOM_BOOTIMG_MK :=  device/samsung/klte/bootimg.mk
 TW_THEME := portrait_hdpi
 RECOVERY_SDCARD_ON_DATA := true
 BOARD_HAS_NO_REAL_SDCARD := true
-RECOVERY_GRAPHICS_USE_LINELENGTH := true
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 TARGET_RECOVERY_QCOM_RTC_FIX := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/msm_dwc3/f9200000.dwc3/gadget/lun%d/file"
-TW_BRIGHTNESS_PATH := "/sys/devices/mdp.0/qcom\x2cmdss_fb_primary.190/leds/lcd-backlight/brightness"
+TW_BRIGHTNESS_PATH := "/sys/devices/mdp.0/qcom\x2cmdss_fb_primary.191/leds/lcd-backlight/brightness"
 TW_MAX_BRIGHTNESS := 255
 TW_DEFAULT_BRIGHTNESS := 162
-TW_INTERNAL_STORAGE_PATH := "/data/media/0"
-TW_INTERNAL_STORAGE_MOUNT_POINT := "data"
-TW_EXTERNAL_STORAGE_PATH := "/external_sd"
-TW_EXTERNAL_STORAGE_MOUNT_POINT := "external_sd"
 TW_NO_REBOOT_BOOTLOADER := true
 TW_HAS_DOWNLOAD_MODE := true
 TW_NO_EXFAT_FUSE := true
 #TW_INCLUDE_NTFS_3G := true
 TW_MTP_DEVICE := "/dev/mtp_usb"
+TW_EXCLUDE_SUPERSU := true
 
 # Encryption support
 TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_CRYPTO_SAMSUNG := true
-#TWRP_INCLUDE_LOGCAT := true
+#TW_INCLUDE_CRYPTO_SAMSUNG := true
+TARGET_HW_DISK_ENCRYPTION := true
 TARGET_KEYMASTER_WAIT_FOR_QSEE := true
+#TWRP_INCLUDE_LOGCAT := true
 #TARGET_USES_LOGD := true
 
 # Init properties from bootloader version, ex. model info

bootimg.mk

@@ -3,7 +3,7 @@ MKBOOTIMG := device/samsung/klte/mkbootimg
 FLASH_IMAGE_TARGET ?= $(PRODUCT_OUT)/recovery.tar
 
 BUILT_RAMDISK_CPIO := $(PRODUCT_OUT)/ramdisk-recovery.cpio
-COMPRESS_COMMAND :=  xz --check=crc32 --lzma2=dict=2MiB
+COMPRESS_COMMAND := xz --format=lzma --lzma1=dict=16MiB -9
 
 ifdef TARGET_PREBUILT_DTB
 	BOARD_MKBOOTIMG_ARGS += --dt $(TARGET_PREBUILT_DTB)
@@ -16,12 +16,14 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(recovery_ramdisk)
 	@echo "------- Making recovery image -------"
 	$(hide) $(MKBOOTIMG) \
 		--kernel $(TARGET_PREBUILT_KERNEL) \
-		--ramdisk $(BUILT_RAMDISK_CPIO).xz \
+		--ramdisk $(BUILT_RAMDISK_CPIO).lzma \
 		--cmdline "$(BOARD_KERNEL_CMDLINE)" \
 		--base $(BOARD_KERNEL_BASE) \
 		--pagesize $(BOARD_KERNEL_PAGESIZE) \
 		$(BOARD_MKBOOTIMG_ARGS) \
 		-o $(INSTALLED_RECOVERYIMAGE_TARGET)
 	@echo "------- Made recovery image: $@ -------"
+	$(hide) echo -n "SEANDROIDENFORCE" >> $(INSTALLED_RECOVERYIMAGE_TARGET)
+	@echo "------- Lied about SEAndroid state to Samsung bootloader -------"
 	$(hide) tar -C $(PRODUCT_OUT) -H ustar -c recovery.img > $(FLASH_IMAGE_TARGET)
 	@echo "------- Made flashable image: $(FLASH_IMAGE_TARGET) -------"

init/init_klte.cpp

@@ -49,46 +49,39 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
 		/* klteatt */
 		property_set("ro.product.model", "SM-G900A");
 		property_set("ro.product.name", "klteuc");
-		property_set("ro.product.device", "klteatt");
 	} else if (strstr(bootloader, "G900W8")) {
 		/* kltecan */
 		property_set("ro.product.name", "kltevl");
 		property_set("ro.product.model", "SM-G900W8");
-		property_set("ro.product.device", "kltecan");
 	} else if (strstr(bootloader, "G900P")) {
 		/* kltespr */
 		property_set("ro.product.model", "SM-G900P");
 		property_set("ro.product.name", "kltespr");
-		property_set("ro.product.device", "kltespr");
 	} else if (strstr(bootloader, "G900T")) {
 		/* kltetmo */
 		property_set("ro.product.model", "SM-G900T");
 		property_set("ro.product.name", "kltetmo");
-		property_set("ro.product.device", "kltetmo");
 	} else if (strstr(bootloader, "G900R4")) {
 		/* klteusc */
 		property_set("ro.product.model", "SM-G900R4");
 		property_set("ro.product.name", "klteusc");
-		property_set("ro.product.device", "klteusc");
 	} else if (strstr(bootloader, "G900V")) {
 		/* kltevzw */
 		property_set("ro.product.model", "SM-G900V");
 		property_set("ro.product.name", "kltevzw");
-		property_set("ro.product.device", "kltevzw");
 	} else if (strstr(bootloader, "G900M")) {
 		/* klteub */
 		property_set("ro.product.model", "SM-G900M");
 		property_set("ro.product.name", "klteub");
-		property_set("ro.product.device", "klteub");
+
 	} else if (strstr(bootloader, "G900I")) {
 		/* kltedv */
 		property_set("ro.product.model", "SM-G900I");
 		property_set("ro.product.name", "kltedv");
-		property_set("ro.product.device", "kltedv");
 	} else {
 		/* all other variants become klte */
 		property_set("ro.product.model", "SM-G900F");
 		property_set("ro.product.name", "kltexx");
-		property_set("ro.product.device", "klte");
 	}
+	property_set("ro.product.device", "klte");
 }

omni.dependencies

@@ -1,8 +1,8 @@
 [
 	{
-		"remote":"TeamWin",
-		"repository":"android_device_qcom_common",
+		"remote":"github",
+		"repository":"CyanogenMod/android_device_qcom_common",
 		"target_path":"device/qcom/common",
-		"revision":"android-6.0"
+		"revision":"cm-13.0"
 	}
 ]

recovery.fstab

@@ -6,5 +6,7 @@
 /data		ext4		/dev/block/platform/msm_sdcc.1/by-name/userdata	flags=encryptable=footer;length=-16384
 /cache		ext4		/dev/block/platform/msm_sdcc.1/by-name/cache
 /efs			ext4		/dev/block/platform/msm_sdcc.1/by-name/efs		flags=backup=1;display="EFS"
+/modemst1		emmc		/dev/block/platform/msm_sdcc.1/by-name/modemst1	flags=backup=1;subpartitionof=/efs
+/modemst2		emmc		/dev/block/platform/msm_sdcc.1/by-name/modemst2	flags=backup=1;subpartitionof=/efs
 /external_sd	vfat		/dev/block/mmcblk1p1 /dev/block/mmcblk1			flags=display="Micro SDcard";storage;wipeingui;removable
 /usbstorage	vfat		/dev/block/sda1 /dev/block/sda				flags=display="USB Storage";storage;wipeingui;removable

recovery/root/init.recovery.qcom.rc

@@ -0,0 +1,9 @@
+service qseecomd /sbin/qseecomd
+
+service logd /system/bin/logd
+    disabled
+    class core
+    socket logd stream 0666 logd logd
+    socket logdr seqpacket 0666 logd logd
+    socket logdw dgram 0222 logd logd
+    group root system

recovery/root/vendor/firmware/cmnlib.b00

@@ -0,0 +1 @@
+/firmware/image/cmnlib.b00

recovery/root/vendor/firmware/cmnlib.b01

@@ -0,0 +1 @@
+/firmware/image/cmnlib.b01

recovery/root/vendor/firmware/cmnlib.b02

@@ -0,0 +1 @@
+/firmware/image/cmnlib.b02

recovery/root/vendor/firmware/cmnlib.b03

@@ -0,0 +1 @@
+/firmware/image/cmnlib.b03

recovery/root/vendor/firmware/cmnlib.mdt

@@ -0,0 +1 @@
+/firmware/image/cmnlib.mdt

recovery/root/vendor/firmware/keymaster/keymaster.b00

@@ -0,0 +1 @@
+/firmware/image/keymaste.b00

recovery/root/vendor/firmware/keymaster/keymaster.b01

@@ -0,0 +1 @@
+/firmware/image/keymaste.b01

recovery/root/vendor/firmware/keymaster/keymaster.b02

@@ -0,0 +1 @@
+/firmware/image/keymaste.b02

recovery/root/vendor/firmware/keymaster/keymaster.b03

@@ -0,0 +1 @@
+/firmware/image/keymaste.b03

recovery/root/vendor/firmware/keymaster/keymaster.mdt

@@ -0,0 +1 @@
+/firmware/image/keymaste.mdt

recovery/root/vendor/lib/libQSEEComAPI.so

@@ -0,0 +1 @@
+/sbin/libQSEEComAPI.so

recovery/root/vendor/lib/libdiag.so

@@ -0,0 +1 @@
+/sbin/libdiag.so

recovery/root/vendor/lib/libdrmfs.so

@@ -0,0 +1 @@
+/sbin/libdrmfs.so

recovery/root/vendor/lib/libdrmtime.so

@@ -0,0 +1 @@
+/sbin/libdrmtime.so

recovery/root/vendor/lib/librpmb.so

@@ -0,0 +1 @@
+/sbin/librpmb.so

recovery/root/vendor/lib/libssd.so

@@ -0,0 +1 @@
+/sbin/libssd.so

system.prop

@@ -1,4 +1,5 @@
 ro.hardware=qcom
+ro.boot.bootdevice=msm_sdcc.1
 ro.lcd_min_brightness=0
 ro.lcd_brightness=162
 ro.sf.lcd_density=480