From 0d3c5379142177241239230b5a333571f74a6747 Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Thu, 24 Oct 2024 16:49:42 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96flash=204=E5=88=86=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../target_config/brandy/build_brandy_update.py | 12 ++++++------ .../driver/nand_flash/nand/nandflash_config.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/sdk/build/config/target_config/brandy/build_brandy_update.py b/code/sdk/build/config/target_config/brandy/build_brandy_update.py index ed29f2d94..b74bde4fd 100755 --- a/code/sdk/build/config/target_config/brandy/build_brandy_update.py +++ b/code/sdk/build/config/target_config/brandy/build_brandy_update.py @@ -141,16 +141,15 @@ def get_new_image(info): result = res_pack(info.res_dir, info.res_index, info.res_data,info.res_delfile,info.res_rmdir) if not result: sys.exit("[ERROR] resource file pack failed!!!") - if os.path.exists(info.res_data): - image_list.append("=".join([info.res_index, "res_index"])) - image_list.append("=".join([info.res_data, "res_data"])) else: print("res dir not exist " + info.res_dir) info.res_dir = None #仅删除 result = res_pack(info.res_dir, info.res_index, info.res_data,info.res_delfile,info.res_rmdir) - if os.path.exists(info.res_data): - image_list.append("=".join([info.res_index, "res_index"])) - image_list.append("=".join([info.res_data, "res_data"])) + if not result: + sys.exit("[ERROR] resource file pack failed!!!") + if os.path.exists(info.res_data): + image_list.append("=".join([info.res_index, "res_index"])) + image_list.append("=".join([info.res_data, "res_data"])) # 镜像签名 @@ -162,6 +161,7 @@ def get_new_image(info): # image_list.append("=".join([info.dsp_overlay_sign, "dsp_overlay_sign"])) new_image = "|".join(image_list) + print("get_new_image done") return new_image diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c index d44636c5d..81f38b8bf 100755 --- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c +++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c @@ -47,7 +47,7 @@ int has_nandflash_init = 0; uint32_t yf_volume_percent[YF_VOLUMES_NUM] = {100}; #else #define YF_VOLUMES_NUM 4 -#define YF_NAME_STRS "/user/system/", "/user/update/", "/user/music/", "/user/" +#define YF_NAME_STRS "/system/", "/update/", "/music/", "/user/" uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 10, 10, 10, 70 }; // uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 1, 1, 1, 97 }; #endif -- 2.17.1