From: SnickerSun <snickersun@163.com>
Date: Mon, 25 Mar 2024 11:01:22 +0000 (+0800)
Subject: 修复recovery 启动 未 mount user 分区问题
X-Git-Tag: release_V1.2.70_20241020_135402~1265
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=81623f24d3a635cdac94ef3796900006439bb098;p=mirrors%2FFD230.git

修复recovery 启动 未 mount user 分区问题
---

diff --git a/code/sdk/application/brandy/brandy_recovery/app_os_init.c b/code/sdk/application/brandy/brandy_recovery/app_os_init.c
index dd3b991f2..a6bff4cbb 100755
--- a/code/sdk/application/brandy/brandy_recovery/app_os_init.c
+++ b/code/sdk/application/brandy/brandy_recovery/app_os_init.c
@@ -177,11 +177,18 @@ static void app_main(const void *unused)
 #ifdef CFG_DRIVERS_NANDFLASH
     yaffs_nand_drv_checkptset(YAFFS_CHECKPT_SKIPED);
     nandflash_init();
+    //为了加速启动,把最耗时的mount_user_res_partition分区放到显示log之后
+
 #endif
 #ifdef SUPPORT_RECOVERY_DISPLAY
     recovery_display_init();
 #endif
     printf("fs init success.\r\n");
+    // recovery_display_sample();
+#ifdef CFG_DRIVERS_NANDFLASH
+    //为了加速启动,把最耗时的mount_user_res_partition分区放到显示log之后
+    mount_user_res_partition();
+#endif
     if (upg_need_upgrade()) {
         printf("need upgrade\r\n");
         upg_func_t upg_func = {0};
diff --git a/code/sdk/application/brandy/brandy_recovery/recovery_display.c b/code/sdk/application/brandy/brandy_recovery/recovery_display.c
index 349ed68b0..207742dc2 100644
--- a/code/sdk/application/brandy/brandy_recovery/recovery_display.c
+++ b/code/sdk/application/brandy/brandy_recovery/recovery_display.c
@@ -97,12 +97,13 @@ void recovery_display_sample(void)
     td_handle dpu_handle;
     ext_dpu_surface surface = {0};
     ext_dpu_layer_info layer_info = {0};
-    ext_rect update_rect = {0, 133, 454, 200}; // 定义一个局部区域
+    ext_rect update_rect = {0, 0, 466, 466}; // 定义一个局部区域
+    // ext_rect update_rect = {0, 133, 454, 200}; // 定义一个局部区域
 
     recovery_dispay_layer_and_surface_init(&surface, &layer_info, &update_rect);
-    // 设置layer全白色, 也可以使用接口recovery_dispay_read_image_and_savein_surface实现从文件系统读图片
+    // 设置layer全白色, 也可以使用接口 recovery_dispay_read_image_and_savein_surface 实现从文件系统读图片
     memset_s((void *)surface.phy_addr, surface.size, 0xff, surface.size);
-    
+    //recovery_dispay_read_image_and_savein_surface("/user/dpu_screen_cap.bin",&surface);
     ret = uapi_dpu_create_layer(&layer_info, &dpu_handle);
     if (ret != ERRCODE_SUCC) {
         return;
diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index c34ab780f..ef82258c9 100755
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -306,6 +306,7 @@ static void thread_main(const void *unused)
 #ifdef CFG_DRIVERS_NANDFLASH
     yaffs_nand_drv_checkptset(YAFFS_CHECKPT_SKIPED);
     nandflash_init();
+    //为了加速启动,把最耗时的mount_user_res_partition分区放到显示log之后
     g_store_init_select = STORE_CLASS_NAND;
 #endif
     uapi_pm_control(PM_DISPLAY_POWER_UP_AND_RUN);
diff --git a/code/sdk/application/brandy/brandy_testsuite/main.c b/code/sdk/application/brandy/brandy_testsuite/main.c
index a74c605f8..e16163e72 100755
--- a/code/sdk/application/brandy/brandy_testsuite/main.c
+++ b/code/sdk/application/brandy/brandy_testsuite/main.c
@@ -200,6 +200,7 @@ static void cmd_processor_entry(void *args)
 #endif
 #ifdef CFG_DRIVERS_NANDFLASH
     nandflash_filesystem_init();
+    mount_user_res_partition();
 #endif
     uapi_test_suite_init();
     test_suite_main_add_functions();
diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
index 20b474eaa..96602e781 100755
--- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
+++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
@@ -61,8 +61,12 @@ void ohos_startup()
 #ifdef ENABLE_UIKIT
     ShowGraphicLogo();
 #endif
+
+#ifdef CFG_DRIVERS_NANDFLASH
     //为了加速启动,把最耗时的mount分区放到显示log之后
     mount_user_res_partition();
+#endif
+
 #ifdef SUPPORT_POWER_MANAGER
     // const power_display_svr_api_t *display_api = power_display_svr_get_api();
     // display_api->turn_on_screen();