diff --git a/yangfan/BUILD.gn b/yangfan/BUILD.gn
index e0b8231bb3b9b6bcf2f6cda8ae763bc9e4142f51..5e37fa94598ad2708154e85b2304d5ad01c6878f 100644
--- a/yangfan/BUILD.gn
+++ b/yangfan/BUILD.gn
@@ -13,5 +13,7 @@ group("rk3399_group") {
     "cfg/rootfs:init_configs",
     "kernel:kernel",
     "//device/soc/rockchip/rk3399/hardware:hardware_group",
+    "//device/soc/rockchip/rk3399/hardware/display:display_buffer_model",
+    "//device/soc/rockchip/rk3399/hardware/display:display_composer_model",
   ]
 }
diff --git a/yangfan/cfg/rootfs/fstab.rk3399 b/yangfan/cfg/rootfs/fstab.rk3399
index 42c8a6e6b4546be949a3d6bdbd8a99d2d38497c2..a1069dfcea1fa3b1156697a40c54f0dba653ad57 100644
--- a/yangfan/cfg/rootfs/fstab.rk3399
+++ b/yangfan/cfg/rootfs/fstab.rk3399
@@ -2,5 +2,5 @@
 #<src>                                                  <mnt_point> <type>    <mnt_flags and options>                              <fs_mgr_flags>
 /dev/block/platform/fe330000.sdhci/by-name/system               /usr       ext4     ro,barrier=1  wait,required
 /dev/block/platform/fe330000.sdhci/by-name/vendor              /vendor        ext4     ro,barrier=1  wait,required
-/dev/block/platform/fe330000.sdhci/by-name/userdata               /data       ext4     nosuid,nodev,noatime,barrier=1,data=ordered,noauto_da_alloc wait,reservedsize=104857600
+/dev/block/platform/fe330000.sdhci/by-name/userdata            /data       f2fs      discard,noatime,nosuid,nodev,fscrypt=2:aes-256-cts:aes-256-xts  wait,check,fileencryption=software,quota
 /dev/block/platform/fe330000.sdhci/by-name/misc /misc none none wait,required
diff --git a/yangfan/cfg/rootfs/init.without_two_stages.cfg b/yangfan/cfg/rootfs/init.without_two_stages.cfg
index eaabed2d52bd726388271fb1847e75f6440946cc..251ac4e1b22c15e16359be26776e813677424f4a 100644
--- a/yangfan/cfg/rootfs/init.without_two_stages.cfg
+++ b/yangfan/cfg/rootfs/init.without_two_stages.cfg
@@ -20,7 +20,7 @@
                 "mkdir /vendor",
                 "mkdir /data",
                 "mount ext4 /dev/block/platform/fe330000.sdhci/by-name/oem /vendor wait rdonly barrier=1",
-                "mount ext4 /dev/block/platform/fe330000.sdhci/by-name/userdata /data wait nosuid nodev noatime barrier=1,data=ordered,noauto_da_alloc",
+                "mount /dev/block/platform/fe330000.sdhci/by-name/userdata /data",
                 "load_persist_params "
             ]
         }, {