summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvagdhan kumar kanukurthi <vagdhank@codeaurora.org>2019-05-07 16:53:24 +0530
committervagdhan kumar kanukurthi <vagdhank@codeaurora.org>2019-05-09 13:43:54 +0530
commitc44c78fab1a2e49d10fbe1b47c2f231dac75a4ef (patch)
treeb3b887c2b01d6ba687ef617555b7ea3ee02210e9
parentd65b615af64f4dca9043f22145f011f8960555ac (diff)
ARM: dts: msm: Update avb flag and partition names for auto
Update vendor avb flag and remove recovery partition from vbmeta partition list as auto does not support recovery partition. Change-Id: Idc6c5e2c2eb2cccd32223e77404fb06ef9e02908 Signed-off-by: Vagdhan Kanukurthi <vagdhank@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto.dtsi6
-rw-r--r--arch/arm/boot/dts/qcom/msm8996.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi4
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
index ba075694d8c9..7dd486618cde 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index 593b227d540f..62abceb7b5b1 100644
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -186,7 +186,7 @@
firmware: firmware {
android {
compatible = "android,firmware";
- vbmeta {
+ android_vbmeta: vbmeta {
compatible = "android,vbmeta";
parts = "vbmeta,boot,system,vendor,dtbo,recovery";
};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
index 262f8397d975..b9ae88fa8865 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
@@ -1,4 +1,4 @@
-/* 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";
};
};