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

Commit e12be408 authored by tracychui(71954)'s avatar tracychui(71954) Committed by Gerrit Code Review
Browse files

Merge "Implement AB partition on Android Q" into 8901-fp3-q-vanilla

parents 327728b2 539f970d
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -37,12 +37,14 @@
		compatible = "simple-bus";
	};

//[20200520][TracyChui]Implement AB partition on Android Q start
	firmware: firmware {
		android {
			compatible = "android,firmware";
			vbmeta {
				compatible = "android,vbmeta";
				parts = "vbmeta,boot,system,vendor,dtbo,recovery";
				parts = "vbmeta,boot,system,vendor,dtbo"; 
				//parts = " vbmeta,boot,system,vendor,dtbo,recovery";
			};

			fstab {
@@ -52,13 +54,15 @@
					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";
					type = "ext4";
					mnt_flags = "ro,barrier=1,discard";
					fsmgr_flags = "wait,avb";
					fsmgr_flags = "wait,slotselect,avb";
					//fsmgr_flags = "wait,avb";
					status = "ok";
				};

			};
		};
	};
//[20200520][TracyChui]Implement AB partition on Android Q end

	reserved-memory {
		#address-cells = <2>;