Merge "Revert "avb: Mount system and vendor for non-multislot"" (3a2b2c46) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/msm8909.dtsi

+2 −6

Original line number	Diff line number	Diff line
		@@ -139,10 +139,6 @@
		firmware: firmware {
		android {
		compatible = "android,firmware";
		vbmeta {
		compatible = "android,vbmeta";
		parts = "vbmeta,boot,system,vendor,recovery";
		};
		fstab {
		compatible = "android,fstab";
		vendor_fstab: vendor {
		@@ -151,7 +147,7 @@
		"/dev/block/platform/soc/7824900.sdhci/by-name/vendor";
		type = "ext4";
		mnt_flags = "ro,barrier=1,discard";
		fsmgr_flags = "wait,avb";
		fsmgr_flags = "wait,verify";
		status = "ok";
		};
		system_fstab: system {
		@@ -160,7 +156,7 @@
		"/dev/block/platform/soc/7824900.sdhci/by-name/system";
		type = "ext4";
		mnt_flags = "ro,barrier=1,discard";
		fsmgr_flags = "wait,avb";
		fsmgr_flags = "wait,verify";
		status = "ok";
		};
		};