diff --git a/drivers/bl702_driver/hal_drv/inc/hal_flash.h b/drivers/bl702_driver/hal_drv/inc/hal_flash.h index 43be312f..6276414c 100644 --- a/drivers/bl702_driver/hal_drv/inc/hal_flash.h +++ b/drivers/bl702_driver/hal_drv/inc/hal_flash.h @@ -29,9 +29,8 @@ int flash_init(void); 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_xip(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_xip(uint32_t startaddr, uint32_t len); +BL_Err_Type flash_read(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_erase(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); #endif diff --git a/drivers/bl702_driver/hal_drv/src/hal_flash.c b/drivers/bl702_driver/hal_drv/src/hal_flash.c index efa6e1b9..f5a1b550 100644 --- a/drivers/bl702_driver/hal_drv/src/hal_flash.c +++ b/drivers/bl702_driver/hal_drv/src/hal_flash.c @@ -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 data * @param len * @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); } /** - * @brief write xip data + * @brief write data * * @param addr * @param data * @param len * @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); } /** - * @brief erase xip data + * @brief erase * * @param startaddr * @param endaddr * @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); } diff --git a/examples/flash/flash_rw_test/main.c b/examples/flash/flash_rw_test/main.c index 215e285a..5d6eb433 100644 --- a/examples/flash/flash_rw_test/main.c +++ b/examples/flash/flash_rw_test/main.c @@ -36,15 +36,15 @@ int main(void) flash_init(); /* erase 0x00010000 16k flash */ - flash_erase_xip(0x00010000, 0x00010000 + (16 * 1024) - 1); + flash_erase(0x00010000, 16 * 1024); /* write 0x00010000 flash data */ - flash_write_xip(0x00010000, writeTestData, sizeof(writeTestData)); + flash_write(0x00010000, writeTestData, sizeof(writeTestData)); memset(readTestData, 0, 256); /* read 0x00010000 flash data */ - flash_read_xip(0x00010000, readTestData, sizeof(readTestData)); + flash_read(0x00010000, readTestData, sizeof(readTestData)); for (i = 0; i < 256; i++) { if (readTestData[i] != i) {