GitHub-Mirror/bl_mcu_sdk
2
0
Fork 0
mirror of https://github.com/Fishwaldo/bl_mcu_sdk.git synced 2025-07-13 00:08:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fix][flash]fix flash demo with new flash erase read write API

Browse source
This commit is contained in:
pfchen 2021-07-06 19:09:33 +08:00
parent d7d10aa400
commit 9a12d1a663
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/bl702_driver/hal_drv/inc/hal_flash.h
View file

@ -29,9 +29,8 @@
int flash_init(void); int flash_init(void);
int flash_read_jedec_id(uint8_t *data); int flash_read_jedec_id(uint8_t *data);
BL_Err_Type flash_read_via_xip(uint32_t addr, uint8_t *data, uint32_t len); BL_Err_Type flash_read(uint32_t addr, uint8_t *data, uint32_t len);
BL_Err_Type flash_read_xip(uint32_t addr, uint8_t *data, uint32_t len); BL_Err_Type flash_write(uint32_t addr, uint8_t *data, uint32_t len);
BL_Err_Type flash_write_xip(uint32_t addr, uint8_t *data, uint32_t len); BL_Err_Type flash_erase(uint32_t startaddr, uint32_t len);
BL_Err_Type flash_erase_xip(uint32_t startaddr, uint32_t len);
BL_Err_Type flash_set_cache(uint8_t cont_read, uint8_t cache_enable, uint8_t cache_way_disable, uint32_t flash_offset); BL_Err_Type flash_set_cache(uint8_t cont_read, uint8_t cache_enable, uint8_t cache_way_disable, uint32_t flash_offset);
#endif #endif

12
drivers/bl702_driver/hal_drv/src/hal_flash.c
View file

@ -76,39 +76,39 @@ BL_Err_Type flash_read_via_xip(uint32_t addr, uint8_t *data, uint32_t len)
} }
/** /**
* @brief read xip data * @brief read data
* *
* @param addr * @param addr
* @param data * @param data
* @param len * @param len
* @return BL_Err_Type * @return BL_Err_Type
*/ */
BL_Err_Type flash_read_xip(uint32_t addr, uint8_t *data, uint32_t len) BL_Err_Type flash_read(uint32_t addr, uint8_t *data, uint32_t len)
{ {
return XIP_SFlash_Read_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, addr, data, len); return XIP_SFlash_Read_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, addr, data, len);
} }
/** /**
* @brief write xip data * @brief write data
* *
* @param addr * @param addr
* @param data * @param data
* @param len * @param len
* @return BL_Err_Type * @return BL_Err_Type
*/ */
BL_Err_Type flash_write_xip(uint32_t addr, uint8_t *data, uint32_t len) BL_Err_Type flash_write(uint32_t addr, uint8_t *data, uint32_t len)
{ {
return XIP_SFlash_Write_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, addr, data, len); return XIP_SFlash_Write_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, addr, data, len);
} }
/** /**
* @brief erase xip data * @brief erase
* *
* @param startaddr * @param startaddr
* @param endaddr * @param endaddr
* @return BL_Err_Type * @return BL_Err_Type
*/ */
BL_Err_Type flash_erase_xip(uint32_t startaddr, uint32_t len) BL_Err_Type flash_erase(uint32_t startaddr, uint32_t len)
{ {
return XIP_SFlash_Erase_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, startaddr, len); return XIP_SFlash_Erase_With_Lock(&g_boot2_flash_cfg, g_boot2_flash_cfg.ioMode & 0x0f, startaddr, len);
} }

6
examples/flash/flash_rw_test/main.c
View file

@ -36,15 +36,15 @@ int main(void)
flash_init(); flash_init();
/* erase 0x00010000 16k flash */ /* erase 0x00010000 16k flash */
flash_erase_xip(0x00010000, 0x00010000 + (16 * 1024) - 1); flash_erase(0x00010000, 16 * 1024);
/* write 0x00010000 flash data */ /* write 0x00010000 flash data */
flash_write_xip(0x00010000, writeTestData, sizeof(writeTestData)); flash_write(0x00010000, writeTestData, sizeof(writeTestData));
memset(readTestData, 0, 256); memset(readTestData, 0, 256);
/* read 0x00010000 flash data */ /* read 0x00010000 flash data */
flash_read_xip(0x00010000, readTestData, sizeof(readTestData)); flash_read(0x00010000, readTestData, sizeof(readTestData));
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
if (readTestData[i] != i) { if (readTestData[i] != i) {