diff options
| author | Petri Laakso <petri.laakso@asd.fi> | 2013-09-14 21:55:57 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-09-25 13:54:27 +0000 |
| commit | b89917020d559ed132ddb044b38e49dd2abb7b89 (patch) | |
| tree | db0a5714e2f208d117ddcb64a019edb6a7b2f566 /src/flash/nor/mini51.c | |
| parent | cfe9ca039f4f6c058dff64effea50a857ff80f96 (diff) | |
build: fix NetBSD build warning
Seems NetBSD does like the name reboot, so rename to keep happy.
Change-Id: I60ada9d217c4a8386a8d1ff1c88db7335451794e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1623
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Diffstat (limited to 'src/flash/nor/mini51.c')
| -rw-r--r-- | src/flash/nor/mini51.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/flash/nor/mini51.c b/src/flash/nor/mini51.c index eb74a314..46e4188d 100644 --- a/src/flash/nor/mini51.c +++ b/src/flash/nor/mini51.c @@ -102,7 +102,6 @@ #define PAGE_SIZE 512 #define TIMEOUT 1000 - struct mini51_flash_bank { bool probed; }; @@ -112,7 +111,6 @@ enum mini51_boot_source { LDROM = 1 }; - /* Private methods */ static int mini51_unlock_reg(struct flash_bank *bank) @@ -139,7 +137,7 @@ static int mini51_reboot_with_source(struct flash_bank *bank, { uint32_t ispcon; uint32_t isprtc1; - bool reboot = false; + bool mini51_reboot = false; int status; int timeout = TIMEOUT; @@ -153,13 +151,13 @@ static int mini51_reboot_with_source(struct flash_bank *bank, if ((new_source == APROM) && (*prev_source != APROM)) { ispcon &= ~ISPCON_BS_LDROM; - reboot = true; + mini51_reboot = true; } else if ((new_source == LDROM) && (*prev_source != LDROM)) { ispcon |= ISPCON_BS_LDROM; - reboot = true; + mini51_reboot = true; } - if (reboot) { + if (mini51_reboot) { mini51_unlock_reg(bank); status = target_write_u32(target, ISPCON, ispcon); if (status != ERROR_OK) @@ -215,7 +213,6 @@ static int mini51_get_flash_size(struct flash_bank *bank, uint32_t *flash_size) return ERROR_OK; } - /* Public (API) methods */ FLASH_BANK_COMMAND_HANDLER(mini51_flash_bank_command) @@ -398,7 +395,6 @@ static int mini51_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offse return ERROR_OK; } - static int get_mini51_info(struct flash_bank *bank, char *buf, int buf_size) { snprintf(buf, buf_size, "Mini51 flash driver"); @@ -460,4 +456,3 @@ struct flash_driver mini51_flash = { .protect_check = mini51_protect_check, .info = get_mini51_info, }; - |