From 1b62bb1ecb7bf1d8e68b67d7a2935b0cbd2cd570 Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Fri, 20 Sep 2024 08:39:03 +0800
Subject: [PATCH] =?utf8?q?Revert=20"=E5=88=86=E5=8C=BA=E8=A1=A8=E9=85=8D?=
 =?utf8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=AD=A30911=20pat?=
 =?utf8?q?ch=E4=B8=8D=E8=83=BD=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
 =?utf8?q?=E3=80=82"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This reverts commit 1e6c77482576e45df294cf9a27396c14688563dd.
---
 code/sdk/build/config/target_config/brandy/config.py        | 4 ----
 .../boards/brandy_evb/product/product_evb4_standard.h       | 6 +++++-
 code/sdk/tools/pkg/packet.py                                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 895068d85..eb756b677 100755
--- 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 346c47a03..0044d3a6d 100755
--- 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 70fab3483..a50d62e20 100755
--- 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]
-- 
2.17.1