Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 20 May 2019 23:24:26 -0700 |
| 4 | Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE |
| 5 | |
| 6 | PAGE_SIZE is defined in system includes on some systems, this would |
| 7 | avoid the unintended conflict |
| 8 | |
| 9 | Fixes |
| 10 | | src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] |
| 11 | | #define PAGE_SIZE 4096 |
| 12 | | ^ |
| 13 | | /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu |
| 14 | de/limits.h:89:9: note: previous definition is here |
| 15 | | #define PAGE_SIZE PAGESIZE |
| 16 | |
| 17 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2] |
| 18 | Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc |
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 20 | --- |
| 21 | src/flash/nor/esirisc_flash.c | 8 ++++---- |
| 22 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 23 | |
| 24 | diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c |
| 25 | index 4e33b942..3bed0658 100644 |
| 26 | --- a/src/flash/nor/esirisc_flash.c |
| 27 | +++ b/src/flash/nor/esirisc_flash.c |
| 28 | @@ -92,7 +92,7 @@ |
| 29 | #endif |
| 30 | |
| 31 | #define CONTROL_TIMEOUT 5000 /* 5s */ |
| 32 | -#define PAGE_SIZE 4096 |
| 33 | +#define FLASH_PAGE_SIZE 4096 |
| 34 | #define PB_MAX 32 |
| 35 | |
| 36 | #define NUM_NS_PER_S 1000000000ULL |
| 37 | @@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last) |
| 38 | (void)esirisc_flash_disable_protect(bank); |
| 39 | |
| 40 | for (int page = first; page < last; ++page) { |
| 41 | - uint32_t address = page * PAGE_SIZE; |
| 42 | + uint32_t address = page * FLASH_PAGE_SIZE; |
| 43 | |
| 44 | target_write_u32(target, esirisc_info->cfg + ADDRESS, address); |
| 45 | |
| 46 | @@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank) |
| 47 | if (target->state != TARGET_HALTED) |
| 48 | return ERROR_TARGET_NOT_HALTED; |
| 49 | |
| 50 | - bank->num_sectors = bank->size / PAGE_SIZE; |
| 51 | - bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); |
| 52 | + bank->num_sectors = bank->size / FLASH_PAGE_SIZE; |
| 53 | + bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors); |
| 54 | |
| 55 | retval = esirisc_flash_init(bank); |
| 56 | if (retval != ERROR_OK) { |
| 57 | -- |
| 58 | 2.21.0 |
| 59 | |