Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa587f6a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable verity for MSM8917/37/53/96"

parents 914b86af 42e046ad

arch/arm/boot/dts/qcom/msm8917.dtsi

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -59,7 +59,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

				 system {
@@ -67,7 +67,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

arch/arm/boot/dts/qcom/msm8937.dtsi

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -35,7 +35,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

				system {
@@ -43,7 +43,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

arch/arm/boot/dts/qcom/msm8953.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

				system {
@@ -44,7 +44,7 @@ 
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};

arch/arm/boot/dts/qcom/msm8996.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
					dev = "/dev/block/platform/soc/7464900.sdhci/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				 };

				 system {
@@ -176,7 +176,7 @@ 
					dev = "/dev/block/platform/soc/7464900.sdhci/by-name/system";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait";

					fsmgr_flags = "wait,verify";

					status = "ok";

				};