interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE 

PAGE_SIZE is defined in system includes on some systems, this would
avoid the unintended conflict

Fixes
| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined]
| #define PAGE_SIZE                       4096
|         ^
| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu
de/limits.h:89:9: note: previous definition is here
| #define PAGE_SIZE PAGESIZE

Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Reviewed-on: http://openocd.zylin.com/5180
Tested-by: jenkins
Reviewed-by: Steven Stallion <sstallion@gmail.com>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Khem Raj 2019-05-20 23:24:26 -07:00 committed by Tomas Vanek
parent 09eb941cb8
commit 101345270b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nor/esirisc_flash.c
View File

@ -92,7 +92,7 @@
#endif #endif
#define CONTROL_TIMEOUT 5000 /* 5s */ #define CONTROL_TIMEOUT 5000 /* 5s */
#define PAGE_SIZE 4096 #define FLASH_PAGE_SIZE 4096
#define PB_MAX 32 #define PB_MAX 32
#define NUM_NS_PER_S 1000000000ULL #define NUM_NS_PER_S 1000000000ULL
@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
(void)esirisc_flash_disable_protect(bank); (void)esirisc_flash_disable_protect(bank);
for (int page = first; page < last; ++page) { for (int page = first; page < last; ++page) {
uint32_t address = page * PAGE_SIZE; uint32_t address = page * FLASH_PAGE_SIZE;
target_write_u32(target, esirisc_info->cfg + ADDRESS, address); target_write_u32(target, esirisc_info->cfg + ADDRESS, address);
@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank)
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
bank->num_sectors = bank->size / PAGE_SIZE; bank->num_sectors = bank->size / FLASH_PAGE_SIZE;
bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors);
retval = esirisc_flash_init(bank); retval = esirisc_flash_init(bank);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {