vts: 2 Testcases failed in the module "vts_fs_test" [1/2]

PD#SWPL-75717
b/225279764

Problem:
2 Testcases failed in the module "vts_fs_test"

Solution:
change data partition to userdata
move partition mount from dts to fstab

Verify:
S905Y2-U221

Change-Id: I4a530337ef8c4220b68b3b1a49860c89044b89f9
Signed-off-by: hao.qi <hao.qi@amlogic.com>

arch/arm/boot/dts/amlogic/firmware_avb_deadpool.dtsi

@@ -12,48 +12,9 @@
 			compatible = "android,firmware";
 			vbmeta {
 				compatible = "android,vbmeta";
-				parts = "vbmeta,boot,system,vendor";
+				parts = "vbmeta,boot";
 				by_name_prefix="/dev/block";
 			};
-		fstab {
-			compatible = "android,fstab";
-			system {
-				compatible = "android,system";
-				dev = "system";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb=vbmeta,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey";
-				};
-
-			vendor {
-				compatible = "android,vendor";
-				dev = "vendor";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb,logical,first_stage_mount";
-				};
-			odm {
-				compatible = "android,odm";
-				dev = "odm";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb,logical,first_stage_mount";
-				};
-			product {
-				compatible = "android,product";
-				dev = "product";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb,logical,first_stage_mount";
-				};
-			metadata {
-				compatible = "android,metadata";
-				dev = "/dev/block/metadata";
-				type = "ext4";
-				mnt_flags = "noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic";
-				fsmgr_flags = "wait,check,formattable,first_stage_mount";
-				};
-			};
 		};
 	};
 };/* end of / */

arch/arm/boot/dts/amlogic/partition_mbox_dynamic_deadpool.dtsi

@@ -26,7 +26,7 @@
 		part-11 = <&tee>;
 		part-12 = <&super>;
 		part-13 = <&cache>;
-		part-14 = <&data>;
+		part-14 = <&userdata>;
 
 		logo:logo{
 			pname = "logo";
@@ -102,9 +102,9 @@
 			size = <0x0 0x32000000>;
 			mask = <2>;
 		};
-		data:data
+		userdata:userdata
 		{
-			pname = "data";
+			pname = "userdata";
 			size = <0xffffffff 0xffffffff>;
 			mask = <4>;
 		};

arch/arm64/boot/dts/amlogic/firmware_avb_deadpool.dtsi

@@ -12,48 +12,9 @@
 			compatible = "android,firmware";
 			vbmeta {
 				compatible = "android,vbmeta";
-				parts = "vbmeta,boot,system,vendor";
+				parts = "vbmeta,boot";
 				by_name_prefix="/dev/block";
 			};
-		fstab {
-			compatible = "android,fstab";
-			system {
-				compatible = "android,system";
-				dev = "system";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb=vbmeta,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey";
-				};
-
-			vendor {
-				compatible = "android,vendor";
-				dev = "vendor";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,avb,logical,first_stage_mount";
-				};
-			odm {
-				compatible = "android,odm";
-				dev = "odm";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,logical,first_stage_mount";
-				};
-			product {
-				compatible = "android,product";
-				dev = "product";
-				type = "ext4";
-				mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-				fsmgr_flags = "wait,logical,first_stage_mount";
-				};
-			metadata {
-				compatible = "android,metadata";
-				dev = "/dev/block/metadata";
-				type = "ext4";
-				mnt_flags = "noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic";
-				fsmgr_flags = "wait,check,formattable,first_stage_mount";
-				};
-			};
 		};
 	};
 };/* end of / */

arch/arm64/boot/dts/amlogic/partition_mbox_dynamic_deadpool.dtsi

@@ -26,7 +26,7 @@
 		part-11 = <&tee>;
 		part-12 = <&super>;
 		part-13 = <&cache>;
-		part-14 = <&data>;
+		part-14 = <&userdata>;
 
 		logo:logo{
 			pname = "logo";
@@ -102,9 +102,9 @@
 			size = <0x0 0x32000000>;
 			mask = <2>;
 		};
-		data:data
+		userdata:userdata
 		{
-			pname = "data";
+			pname = "userdata";
 			size = <0xffffffff 0xffffffff>;
 			mask = <4>;
 		};