分区表配置修改，修正0911 patch不能下载问题。

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index ba857cd..00210aa 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -358,6 +358,8 @@ target = {
                     '_ALL_SOURCE', 'SUPPORT_CXX', 'I2C_SLAVE_REG_ADDR_4BYTE', 'CFG_DRIVERS_NANDFLASH',
                     "-:TARGET_CHIP_BRANDY=1", "-:BRANDY_CHIP_V100=1", 'ENABLE_UIKIT', 'SW_UART_DEBUG', "HASH_MEM_COPY",
                     'FT_SINGLE_UART','TPTYPE_FT6X46',
+                    'CFG_FLASH_SIZE=16',
+                    'FD230',
                     'ENABLE_ECC', 'SUPPORT_RECOVERY_DISPLAY'],
         'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", "osal", "arch_port", "-:testsuite",
                           "liteos_port", 'lcd', 'qspi_display', 'dfx_file_operation',
@@ -417,6 +419,8 @@ target = {
                     "LIBCODELOADER_SSB", "LIBJLINK_LOAD", "LIBLIB_UTILS", "LIBBUILD_VERSION",
                                "NO_TIMEOUT", "CONFIG_UART_BAUD_RATE_DIV_8", 'SW_UART_DEBUG', 'LARGE_BUFFER',
                                        'ENABLE_ECC',"CFG_DRIVERS_NANDFLASH",
+                    'CFG_FLASH_SIZE=16',
+                    'FD230',
                     'FT_SINGLE_UART'
                     ],
         'ram_component': ['arch_port', 'hal_l2ram', 'sec_boot', 'libboundscheck',

diff --git a/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h b/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h
index c0a6c37..c03c298 100755 (executable)
--- a/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h
+++ b/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h
@@ -54,11 +54,7 @@
 #endif
 #define NV_IMAGE_PAGES                      4
 #define FOTA_IMAGE_PAGES                    3
-#ifdef FD230
-#define FOTA_IMAGE_START                    0xFFD000
-#else
-#define FOTA_IMAGE_START                    0x770000
-#endif
+#define FOTA_IMAGE_START                    0x770000  //其他产品，未用到
 #define SSB_FOTA_OFFSET                     0x0
 #define XO_CTRIM_VALUR_DEFAULT              0x56
 #define DSP1_IPC_ENABLE                     NO

diff --git a/code/sdk/tools/pkg/chip_packet/brandy/packet.py b/code/sdk/tools/pkg/chip_packet/brandy/packet.py
index 2a9345e..4482204 100755 (executable)
--- a/code/sdk/tools/pkg/chip_packet/brandy/packet.py
+++ b/code/sdk/tools/pkg/chip_packet/brandy/packet.py
@@ -34,7 +34,7 @@ def build_brandy_other_bin(pack_style_str, flash_size):
         partition_cfg = os.path.join(partition_cfg, "param_sector_fd230.json")
     else:
         partition_cfg = os.path.join(partition_cfg, "param_sector.json")
-    
+    print("partition_cfg {}".format(partition_cfg))
     partition_bin = os.path.join(SDK_DIR, "output", "brandy", "partition_table.bin")
     # nv配置文件路径
     nv_config_json = os.path.join(chip_dir, "nv_bin_cfg")
@@ -117,6 +117,8 @@ def make_all_in_one_packet_8M(pack_style_str):
 
 def make_all_in_one_packet_fd230(pack_style_str):
     # make all in one packet
+    print("make_all_in_one_packet_fd230 {}".format(pack_style_str))
+
     bin_dir = os.path.join(PKG_DIR, "bin", "brandy")
     application_dir = os.path.join(SDK_DIR,
                                    "output",

diff --git a/code/sdk/tools/pkg/packet.py b/code/sdk/tools/pkg/packet.py
index 1f4fe7c..cab6482 100755 (executable)
--- a/code/sdk/tools/pkg/packet.py
+++ b/code/sdk/tools/pkg/packet.py
@@ -13,7 +13,7 @@ sys.dont_write_bytecode = True
 
 def main():
     arg_ls = sys.argv
-    if len(arg_ls) != 3:
+    if len(arg_ls) != 4:
         print("Parameter error")
     build_soc = sys.argv[1]
     build_target = sys.argv[2]