From: SnickerSun Date: Sun, 20 Oct 2024 05:42:44 +0000 (+0800) Subject: 添加nandflash oob128 支持 X-Git-Tag: release_V1.2.70_20241020_135402~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=133aefd3d71ecee9b2fe8bc44b5c709e90a64ac3;p=mirrors%2FFD230.git 添加nandflash oob128 支持 --- diff --git a/autobuild.sh b/autobuild.sh index b1c8a343b..fb1cef101 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -8,7 +8,7 @@ DEFAULT_TARGET_PACK_NAME=pack_brandy_native_js DEFAULT_APPLICATION_NAME=brandy-native-js DEFAULT_TARGET_PACK_NAME_USER=pack_brandy_native_js_user DEFAULT_APPLICATION_NAME_USER=brandy-native-js-user -DEFAULT_CUSTOM_FW_VERSION=1.2.69 +DEFAULT_CUSTOM_FW_VERSION=1.2.70 TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME APPLICATION_NAME=$DEFAULT_APPLICATION_NAME @@ -44,6 +44,13 @@ TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME_USER APPLICATION_NAME=$DEFAULT_APPLICATION_NAME_USER fi +if [ "$1" == "oob128" ] +then +TARGET_PACK_NAME=pack_brandy_native_js_oob128 +APPLICATION_NAME=brandy-native-js-oob128 +BUILD_NAME=_OOB128 +fi + if [ "$1" == "z1" ] then TARGET_PACK_NAME=pack_brandy_native_js_z1 diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-oob128/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-oob128/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-oob128/libmsg_center.a differ diff --git a/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_config.h b/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_config.h index e902c38b2..9986e4cfb 100755 --- a/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_config.h +++ b/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_config.h @@ -47,7 +47,7 @@ int nandflash_filesystem_init(void); void nandflash_qspi_init(void); void nandflash_qspi_resume(void); -int mount_user_res_partition(void); +// int mount_user_res_partition(void); void test_nand_flash_read_8(struct nand_driver_struct *test_nand_flash_driver, uint32_t nand_page); void test_nand_flash_write_width8(struct nand_driver_struct *test_nand_flash_driver, uint32_t nand_page); #endif /* End of #ifndef MC_NAND_CONFIG_H */ diff --git a/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_ds35x1g.h b/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_ds35x1g.h index 75956dbb4..1b6ab3263 100755 --- a/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_ds35x1g.h +++ b/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_ds35x1g.h @@ -1,8 +1,8 @@ /* * @Author: penglei 1624952103@qq.com * @Date: 2024-06-29 17:26:01 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-07-02 16:41:57 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-10-20 00:07:44 * @FilePath: /FD230/code/sdk/bootloader/flashboot/brandy/nandflash/include/nandflash_ds35x1g.h * @Description: * @@ -19,17 +19,26 @@ #define NANDFLASH_DS35X1G_H #define DS35X1G_BYTES_PER_PAGE 2048 -#define DS35X1G_BYTES_PER_OOB 64 #define DS35X1G_PAGES_PER_BLOCK 64 #define DS35X1G_TOTAL_BLOCKS 1024 #define DS35X1G_CHIP_ID 0xE521//0xE521,6161 id 没有check +#ifdef NANDFLASH_OOB_128 /* 外发flash固件到工厂烧录**/ +#define DS35X1G_BYTES_PER_OOB 128 +#define DS35X1G_OOB_TOTAL_LEN 1 +#define DS35X1G_OOB_PER_SIZE 32 +#define DS35X1G_OOB_1_OFFSET 0 +#define DS35X1G_OOB_2_OFFSET 0 +#define DS35X1G_OOB_3_OFFSET 0 +#define DS35X1G_OOB_4_OFFSET 0 +#else +#define DS35X1G_BYTES_PER_OOB 64 #define DS35X1G_OOB_TOTAL_LEN 4 #define DS35X1G_OOB_PER_SIZE 8 #define DS35X1G_OOB_1_OFFSET 0 #define DS35X1G_OOB_2_OFFSET 16 #define DS35X1G_OOB_3_OFFSET 32 #define DS35X1G_OOB_4_OFFSET 48 - +#endif extern struct nand_driver_struct g_ds35x1g_driver; #endif /* End of #ifndef MC_NAND_DS35X1G_H */ diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index d71d6093b..b49a25720 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -201,6 +201,15 @@ target = { 'fs_image_path':'fd230', 'defines': ['-:SW_UART_DEBUG', '-:DUMP_MEM_SUPPORT', '-:DUMP_REG_SUPPORT', '-:SUPPORT_DFX_EXCEPTION'], }, + + 'brandy-native-js-oob128': { + 'base_target_name': 'brandy-native-js', + 'fs_image_path':'fd230', + 'nandflash_oobsize': '128', + 'defines': [ + 'NANDFLASH_OOB_128' + ], + }, 'brandy-native-js-leakcheck': { 'base_target_name': 'brandy-native-js', 'fs_image_path':'fd230', @@ -441,6 +450,12 @@ target = { ], 'ram_component_set': ['pinctrl'], 'target': 'ssb', + }, + 'brandy-ssb-oob128': { + 'base_target_name': 'brandy-ssb', + 'defines': [ + 'NANDFLASH_OOB_128', + ] } } @@ -460,7 +475,7 @@ target_group = { 'pack_brandy_native_js_ct': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-ct'], 'pack_brandy_native_js_cm': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-cm'], 'pack_brandy_xts': ['brandy-ssb', 'brandy-xts-r', 'brandy-xts'], - + 'pack_brandy_native_js_oob128': ['brandy-ssb-oob128', 'brandy-native-js-r', 'brandy-native-js-oob128'], 'brandy_all': ['brandy-ssb', 'brandy-target1', 'brandy-target3', 'brandy-target4', 'brandy-target5', 'brandy-native-js', 'brandy-native-js-user', 'brandy-xts', 'brandy-target1-r', 'brandy-target3-r', 'brandy-target4-r', 'brandy-target5-r', 'brandy-native-js-r', 'brandy-xts-r', diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py index fecffef45..0052ed369 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py @@ -77,6 +77,13 @@ def get_obb_type(obb_size): if __name__ == "__main__": image_file = os.path.join(cur_dir, "%s.bin" %image_name) tmp_file = os.path.join(cur_dir, "%s_tmp.bin" %image_name) + if len(sys.argv) == 3 : + out_path = os.path.join(sys.argv[1], "%s.bin" %image_name) + if sys.argv[2] == '128' : + cfg_obb_size = 128 + else: + print("need give parms output path and oobsize!") + sys.exit(1) if sys.platform == 'linux2' or sys.platform == 'linux': partition_total = 0 @@ -98,8 +105,7 @@ if __name__ == "__main__": os.system(command) convert(tmp_file, image_file) - if (len(sys.argv) == 2 and os.path.exists(image_file)): - out_path = os.path.join(sys.argv[1], "%s.bin" %image_name) + if os.path.exists(image_file): shutil.copyfile(image_file, out_path) print("make yaffs image file over!") diff --git a/code/sdk/build/script/cmake_builder.py b/code/sdk/build/script/cmake_builder.py index a0e5da8ff..0af478df1 100755 --- a/code/sdk/build/script/cmake_builder.py +++ b/code/sdk/build/script/cmake_builder.py @@ -150,7 +150,10 @@ class CMakeBuilder(BuildEnvironment): output_path = env.get_output_path() print(output_path) # errcode = exec_shell([self.python_path, fs_script_path], None, True) - errcode = exec_shell([self.python_path, fs_script_path, output_path], None, True) + if env.get("nandflash_oobsize") : + errcode = exec_shell([self.python_path, fs_script_path, output_path, env.get("nandflash_oobsize")], None, True) + else : + errcode = exec_shell([self.python_path, fs_script_path, output_path, '64' ], None, True) if errcode != 0: print("creat fs image error!") self.print_build_result(target, errcode) diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/include/nandflash_ds35x1g.h b/code/sdk/drivers/drivers/driver/nand_flash/nand/include/nandflash_ds35x1g.h index 2b5c20fc7..9f0730488 100755 --- a/code/sdk/drivers/drivers/driver/nand_flash/nand/include/nandflash_ds35x1g.h +++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/include/nandflash_ds35x1g.h @@ -1,8 +1,8 @@ /* * @Author: penglei 1624952103@qq.com * @Date: 2024-06-07 11:18:26 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-07-02 16:42:22 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-10-20 13:41:37 * @FilePath: /FD230/code/sdk/drivers/drivers/driver/nand_flash/nand/include/nandflash_ds35x1g.h * @Description: * @@ -19,17 +19,26 @@ #define NANDFLASH_DS35X1G_H #define DS35X1G_BYTES_PER_PAGE 2048 -#define DS35X1G_BYTES_PER_OOB 64 #define DS35X1G_PAGES_PER_BLOCK 64 #define DS35X1G_TOTAL_BLOCKS 1024 #define DS35X1G_CHIP_ID 0xE521//0xE521,6161 id 没有check +#ifdef NANDFLASH_OOB_128 /* 外发flash固件到工厂烧录**/ +#define DS35X1G_BYTES_PER_OOB 128 +#define DS35X1G_OOB_TOTAL_LEN 1 +#define DS35X1G_OOB_PER_SIZE 32 +#define DS35X1G_OOB_1_OFFSET 0 +#define DS35X1G_OOB_2_OFFSET 0 +#define DS35X1G_OOB_3_OFFSET 0 +#define DS35X1G_OOB_4_OFFSET 0 +#else +#define DS35X1G_BYTES_PER_OOB 64 #define DS35X1G_OOB_TOTAL_LEN 4 #define DS35X1G_OOB_PER_SIZE 8 #define DS35X1G_OOB_1_OFFSET 0 #define DS35X1G_OOB_2_OFFSET 16 #define DS35X1G_OOB_3_OFFSET 32 #define DS35X1G_OOB_4_OFFSET 48 - +#endif extern struct nand_driver_struct g_ds35x1g_driver; #endif /* End of #ifndef MC_NAND_DS35X1G_H */ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-oob128/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-oob128/libgfx_rm.a new file mode 100644 index 000000000..18778c101 Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-oob128/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-oob128/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-oob128/libdisplay_gfx.a new file mode 100644 index 000000000..464b21c8c Binary files /dev/null and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-oob128/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-oob128/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-oob128/libuikit_ext.a new file mode 100644 index 000000000..aa7a1f3f6 Binary files /dev/null and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-oob128/libuikit_ext.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-oob128/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-oob128/libx_vfs_private.a new file mode 100644 index 000000000..e94333adf Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-oob128/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-oob128/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-oob128/libfs_yaffs2.a new file mode 100644 index 000000000..5d415bd2c Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-oob128/libfs_yaffs2.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-oob128/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-oob128/libams.a new file mode 100644 index 000000000..911e68a7a Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-oob128/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-oob128/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-oob128/libace.a new file mode 100644 index 000000000..5cd4368ca Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-oob128/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-oob128/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-oob128/libbms.a new file mode 100644 index 000000000..2c35a7e5d Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-oob128/libbms.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-oob128/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-oob128/libjerryscript.a new file mode 100644 index 000000000..4c6839d58 Binary files /dev/null and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-oob128/libjerryscript.a differ