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

Commit f228ed90 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: Update avb flag and partition names for auto"

parents f8572fa1 c44c78fa

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

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ 
 */



&android_vendor {

	fsmgr_flags = "wait,slotselect,verify";

	fsmgr_flags = "wait,slotselect,avb";

};



&android_vbmeta {

	parts = "vbmeta,boot,system,vendor,dtbo";

};



&peripheral_mem {

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

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
	firmware: firmware {

		android {

			compatible = "android,firmware";

			vbmeta {

			android_vbmeta: vbmeta {

				compatible = "android,vbmeta";

				parts = "vbmeta,boot,system,vendor,dtbo,recovery";

			};

arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 2019 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
@@ -18,7 +18,7 @@ 
			fstab {

				/delete-node/ system;

				vendor {

					fsmgr_flags = "wait,slotselect,verify";

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

				};

			};