From: SnickerSun Date: Tue, 5 Nov 2024 09:27:53 +0000 (+0800) Subject: 添加u8m 8MB nor flash 版本编译参数。目前application超限，需要调整功能。 X-Git-Tag: fd230_release_V1.3.102~127 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=21a6c95c9517a1ab5000347638fe5f4e55f82e15;p=mirrors%2FFD230.git 添加u8m 8MB nor flash 版本编译参数。目前application超限，需要调整功能。 --- diff --git a/autobuild.sh b/autobuild.sh index 9d8a4b211..960100390 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -45,6 +45,13 @@ if [ "$1" == "user" ] then TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME_USER APPLICATION_NAME=$DEFAULT_APPLICATION_NAME_USER +BUILD_NAME=_USER +fi +if [ "$1" == "u8m" ] +then +TARGET_PACK_NAME=pack_brandy_native_js_u8m +APPLICATION_NAME=brandy-native-js-u8m +BUILD_NAME=_U8M fi if [ "$1" == "uoffline" ] diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-u8m/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-u8m/libmsg_center.a new file mode 100644 index 000000000..c8022217f Binary files /dev/null and b/code/sdk/application/wearable/service/msg_center/brandy-native-js-u8m/libmsg_center.a differ diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index d4a79133d..a37609761 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -209,6 +209,16 @@ target = { '-:DUMP_REG_SUPPORT', '-:SUPPORT_DFX_EXCEPTION'], }, + 'brandy-native-js-u8m': { + 'base_target_name': 'brandy-native-js', + 'fs_image_path':'fd230', + 'defines': ['-:SW_UART_DEBUG', + '-:DUMP_MEM_SUPPORT', + '-:DUMP_REG_SUPPORT', + '-:SUPPORT_DFX_EXCEPTION', + '-:CFG_FLASH_SIZE=8' + ], + }, 'brandy-native-js-uoffline': { 'base_target_name': 'brandy-native-js', 'fs_image_path':'fd230', @@ -418,6 +428,12 @@ target = { 'base_target_name': 'brandy-native-js-r', 'defines': ['-:SINGLE_USER_PARTITION'] }, + 'brandy-native-js-r-u8m': { + 'base_target_name': 'brandy-native-js-r', + 'defines': [ + '-:CFG_FLASH_SIZE=8' + ] + }, 'brandy-xts-r': { 'board': 'evb', 'base_target_name': 'target_brandy_recovery_template', @@ -482,6 +498,12 @@ target = { 'defines': [ 'NANDFLASH_OOB_128', ] + }, + 'brandy-ssb-u8m': { + 'base_target_name': 'brandy-ssb', + 'defines': [ + '-:CFG_FLASH_SIZE=8' + ] } } @@ -493,6 +515,7 @@ target_group = { 'pack_brandy_target5': ['brandy-ssb', 'brandy-target5-r', 'brandy-target5'], 'pack_brandy_native_js': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js'], 'pack_brandy_native_js_user': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-user'], + 'pack_brandy_native_js_u8m': ['brandy-ssb-u8m', 'brandy-native-js-r-u8m', 'brandy-native-js-u8m'], 'pack_brandy_native_js_uoffline': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-uoffline'], 'pack_brandy_native_js_leakcheck': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-leakcheck'], 'pack_brandy_native_js_autoota': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-autoota'], diff --git a/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h b/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h index 64bd965cb..e210a0ed9 100755 --- a/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h +++ b/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h @@ -135,14 +135,20 @@ * 打包脚本： * tools\pkg\chip_packet\brandy\packet.py */ -#if defined(CFG_FLASH_SIZE) && (CFG_FLASH_SIZE == 16) -#ifdef FD230 -#include "flash_16M_FD230.h" +#if defined(CFG_FLASH_SIZE) + #if (CFG_FLASH_SIZE == 16) + // #warning CFG_FLASH_SIZE = 16 + #ifdef FD230 + #include "flash_16M_FD230.h" + #else + #include "flash_16M.h" + #endif + #else + // #warning CFG_FLASH_SIZE = 8 + #include "flash_8M.h" + #endif #else -#include "flash_16M.h" -#endif -#else -#include "flash_8M.h" + #warning no CFG_FLASH_SIZE defined #endif /* 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 c8b87a568..264e15c5a 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 @@ -25,32 +25,38 @@ #else #define ENABLE_LOW_POWER NO #endif -#if defined(CFG_FLASH_SIZE) && (CFG_FLASH_SIZE == 16) -#ifdef FD230 -#define DTB_IMAGE_PAGES 0 -#define RECOVERY_IMAGE_PAGES 64 -#define RESERVE_IMAGE_PAGES 0 -#define BT_IMAGE_PAGES 112 -#define HIFI0_IMAGE_PAGES 112 -#define HIFI0_CODEC_PAGES 320 -#define APP_IMAGE_PAGES 3401 +#if defined(CFG_FLASH_SIZE) + #if (CFG_FLASH_SIZE == 16) + // #warning CFG_FLASH_SIZE = 16 + #ifdef FD230 + #define DTB_IMAGE_PAGES 0 + #define RECOVERY_IMAGE_PAGES 64 + #define RESERVE_IMAGE_PAGES 0 + #define BT_IMAGE_PAGES 112 + #define HIFI0_IMAGE_PAGES 112 + #define HIFI0_CODEC_PAGES 320 + #define APP_IMAGE_PAGES 3401 + #else + #define DTB_IMAGE_PAGES 0 + #define RECOVERY_IMAGE_PAGES 256 + #define RESERVE_IMAGE_PAGES 64 + #define BT_IMAGE_PAGES 112 + #define HIFI0_IMAGE_PAGES 192 + #define HIFI0_CODEC_PAGES 448 + #define APP_IMAGE_PAGES 2048 + #endif + #else + // #warning CFG_FLASH_SIZE = 8 + #define DTB_IMAGE_PAGES 0 + #define RECOVERY_IMAGE_PAGES 64 + #define RESERVE_IMAGE_PAGES 0 + #define BT_IMAGE_PAGES 112 + #define HIFI0_IMAGE_PAGES 112 + #define HIFI0_CODEC_PAGES 320 + #define APP_IMAGE_PAGES 1353 + #endif #else -#define DTB_IMAGE_PAGES 0 -#define RECOVERY_IMAGE_PAGES 256 -#define RESERVE_IMAGE_PAGES 64 -#define BT_IMAGE_PAGES 112 -#define HIFI0_IMAGE_PAGES 192 -#define HIFI0_CODEC_PAGES 448 -#define APP_IMAGE_PAGES 2048 -#endif -#else -#define DTB_IMAGE_PAGES 0 -#define RECOVERY_IMAGE_PAGES 64 -#define RESERVE_IMAGE_PAGES 0 -#define BT_IMAGE_PAGES 112 -#define HIFI0_IMAGE_PAGES 112 -#define HIFI0_CODEC_PAGES 320 -#define APP_IMAGE_PAGES 1353 +#warning no CFG_FLASH_SIZE defined #endif #define NV_IMAGE_PAGES 4 #define FOTA_IMAGE_PAGES 3 diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r-u8m/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r-u8m/libgfx_rm.a new file mode 100644 index 000000000..b6b63fe41 Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r-u8m/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-u8m/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-u8m/libgfx_rm.a new file mode 100644 index 000000000..8b2b0dfa2 Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-u8m/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-u8m/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-u8m/libdisplay_gfx.a new file mode 100644 index 000000000..a9dbb4530 Binary files /dev/null and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-u8m/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-u8m/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-u8m/libuikit_ext.a new file mode 100644 index 000000000..b35257668 Binary files /dev/null and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-u8m/libuikit_ext.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r-u8m/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r-u8m/libx_vfs_private.a new file mode 100644 index 000000000..9146a5dce Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r-u8m/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-u8m/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-u8m/libx_vfs_private.a new file mode 100644 index 000000000..2098718fa Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-u8m/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r-u8m/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r-u8m/libfs_yaffs2.a new file mode 100644 index 000000000..a2818eef3 Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r-u8m/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-u8m/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-u8m/libfs_yaffs2.a new file mode 100644 index 000000000..673fa280a Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-u8m/libfs_yaffs2.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-u8m/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-u8m/libams.a new file mode 100644 index 000000000..c2cf773f6 Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-u8m/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-u8m/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-u8m/libace.a new file mode 100644 index 000000000..d75a78751 Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-u8m/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-u8m/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-u8m/libbms.a new file mode 100644 index 000000000..3ad0d2547 Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-u8m/libbms.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-u8m/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-u8m/libjerryscript.a new file mode 100644 index 000000000..009009cc3 Binary files /dev/null and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-u8m/libjerryscript.a differ