suport Treble

imzf · Aug 1, 2018 · 03e9623 · 03e9623
1 parent 119e41e
commit 03e9623
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/arch/arm/boot/dts/qcom/msm8937.dtsi b/arch/arm/boot/dts/qcom/msm8937.dtsi
@@ -30,14 +30,14 @@
 			compatible = "android,firmware";
 			fstab {
 				compatible = "android,fstab";
-				/*vendor {
+				vendor {
 					compatible = "android,vendor";
-					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";
+					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/cust";
 					type = "ext4";
 					mnt_flags = "ro,barrier=1,discard";
 					fsmgr_flags = "wait";
 					status = "ok";
-				};*/
+				};
 				system {
 					compatible = "android,system";
 					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

diff --git a/arch/arm64/configs/santoni_defconfig b/arch/arm64/configs/santoni_defconfig
@@ -51,7 +51,7 @@ CONFIG_SWAP=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_FHANDLE is not set
-CONFIG_USELIB=y
+CONFIG_USELIB=n
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
@@ -2710,6 +2710,7 @@ CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y
 CONFIG_MSMB_JPEG=y
 CONFIG_MSM_FD=y
 # CONFIG_MSM_JPEGDMA is not set
+CONFIG_MSM_SEC_CCI_TA_NAME="seccamdemo64"
 # CONFIG_MSM_AIS is not set
 # CONFIG_TSPP is not set
 # CONFIG_MSM_SDE_ROTATOR is not set
@@ -4493,7 +4494,7 @@ CONFIG_ENCRYPTED_KEYS=y
 #
 # CONFIG_PFK is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
@@ -4502,7 +4503,7 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
 CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
 # CONFIG_SECURITY_SELINUX_DISABLE is not set