开启file.bin模式，通过burntool烧录资源文件，为生产做准备

diff --git a/code/sdk/.gitignore b/code/sdk/.gitignore
index 27a750b..fb2c244 100644 (file)
--- a/code/sdk/.gitignore
+++ b/code/sdk/.gitignore
@@ -10,3 +10,6 @@ interim_binary/brandy/libs/gpu/evb_standard/libgpu.a
 interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a
 interim_binary/brandy/libs/media/evb_standard/libjs_player.a
 build/script/parse_tool/__pycache__/**
+build/config/target_config/brandy/mk_fs_image/file.bin
+build/config/target_config/brandy/mk_fs_image/file_tmp.bin
+tools/pkg/fwpkg/brandy/**

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 392bafc..ad8778a 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -124,7 +124,7 @@ target = {
         'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'alipay_set'],
         'dsp_version': 'max',
         'packet': True,
-        'fs_image': False
+        'fs_image': True
     },
     #native-xts: liteos + uikit + nandflash + mipi + psram + audio  典型合封UIKIT版本
     'brandy-xts': {
@@ -147,7 +147,7 @@ target = {
         'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'xts_set', 'xts_test_set', 'alipay_set'],
         'dsp_version': 'max',
         'packet': True,
-        'fs_image': False
+        'fs_image': True
     },
 
     'brandy-target1-r': {
@@ -264,7 +264,7 @@ target = {
         'defines': ["-:TARGET_CHIP_BRANDY=1", "-:BRANDY_CHIP_V100=1", "PRE_ASIC", "BRANDY_PRODUCT_EVB4",
                     "SSB_USE_PLL", "VERSION_STANDARD", "BUILD_APPLICATION_SSB", "LIBBOOTLOADER", "LIBCODELOADER",
                     "LIBCPU_UTILS", "LIBAPP_VERSION", "LIBPANIC", "LIBCONNECTIVITY", "LIBERROR_CODE", "LIBSEC_RANDOM",
-                    "LIBCODELOADER_SSB", "LIBJLINK_LOAD", "LIBLIB_UTILS", "LIBBUILD_VERSION",
+                    "LIBCODELOADER_SSB", "LIBJLINK_LOAD", "LIBLIB_UTILS", "LIBBUILD_VERSION",'ENABLE_ECC',"CFG_DRIVERS_NANDFLASH",
                     "NO_TIMEOUT", "CONFIG_UART_BAUD_RATE_DIV_8", 'SW_UART_DEBUG', 'LARGE_BUFFER'],
         'ram_component': ['arch_port', 'hal_l2ram', 'sec_boot', 'libboundscheck',
                           'dfx_exception', 'error_code', 'psram', 'osal', 'cmn_header', 'boot_nandflash'],

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/mkyaffs2tool.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/mkyaffs2tool.py
index 9b710c8..7495f9a 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/mkyaffs2tool.py
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/mkyaffs2tool.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.7
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 import os
@@ -30,10 +30,19 @@ cfg_obb_size = 64
 # 配置分区信息，请根据实际情况进行配置，添加格式为[分区路径， 分区大小]
 # 分区大小需要根据按照百分系统分配好后的blocks数进行计算，大小=blocks（文件块个数）*pages_per_block（每个文件块包含的页数）*bytes_per_page（每页包含字节数）
 # 前面按照比例分好分区，最后分区置成null，即代表剩下所有blocks
+# drivers/drivers/driver/nand_flash/nand/nandflash_config.c 
+# #ifndef MEMORY_MINI
+# #define YF_NAME_STRS "/system/", "/update/", "/music/", "/user/"
+# uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 1, 1, 1, 97 };
+#                                               0x140000
+#                                                10 10 10 70
+#                                               0xcc0000
+
+
 partition_list = [
-    [os.path.join(cur_dir, 'fs', 'system'), "0xcc0000"],
-    [os.path.join(cur_dir, 'fs', 'update'), "0xcc0000"],
-    [os.path.join(cur_dir, 'fs', 'music'), "0xcc0000"],
+    [os.path.join(cur_dir, 'fs', 'system'), "0x140000"],
+    [os.path.join(cur_dir, 'fs', 'update'), "0x140000"],
+    [os.path.join(cur_dir, 'fs', 'music'), "0x140000"],
     [os.path.join(cur_dir, 'fs', 'user'), "null"]
 ]
 
@@ -60,7 +69,7 @@ def get_page_type(page_size):
 def get_obb_type(obb_size):
     if obb_size == 64:
         return " 2"
-    elif page_size == 128:
+    elif obb_size == 128:
         return " 4"
     else:
         return " 0"
@@ -93,4 +102,4 @@ if __name__ == "__main__":
         out_path = os.path.join(sys.argv[1], "%s.bin" %image_name)
         shutil.copyfile(image_file, out_path)
 
-    print("make yaffs image file over!")
\ No newline at end of file
+    print("make yaffs image file over!")

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 e17ebe9..75dd6c7 100755 (executable)
--- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
+++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
@@ -45,7 +45,7 @@ int has_nandflash_init = 0;
 
 #ifndef MEMORY_MINI
 #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 };
 #else
 #define YF_NAME_STRS "/user/"
 uint32_t yf_volume_percent[YF_VOLUMES_NUM] = {100};