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

This reverts commit 1e6c77482576e45df294cf9a27396c14688563dd.

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 895068d..eb756b6 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -359,8 +359,6 @@ 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',
@@ -420,8 +418,6 @@ 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 346c47a..0044d3a 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
@@ -34,7 +34,11 @@
 #define APP_IMAGE_PAGES                     3401
 #define NV_IMAGE_PAGES                      4
 #define FOTA_IMAGE_PAGES                    3
-#define FOTA_IMAGE_START                    0x770000  //其他产品，未用到
+#ifdef FD230
+#define FOTA_IMAGE_START                    0xFFD000
+#else
+#define FOTA_IMAGE_START                    0x770000
+#endif
 #define SSB_FOTA_OFFSET                     0x0
 #define XO_CTRIM_VALUR_DEFAULT              0x56
 #define DSP1_IPC_ENABLE                     NO

diff --git a/code/sdk/tools/pkg/packet.py b/code/sdk/tools/pkg/packet.py
index 70fab34..a50d62e 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) != 4:
+    if len(arg_ls) != 3:
         print("Parameter error")
     build_soc = sys.argv[1]
     build_target = sys.argv[2]