diff options
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/at91sam4l.c | 10 | ||||
| -rw-r--r-- | src/flash/nor/at91samd.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c index 0139f61c..a5eb6727 100644 --- a/src/flash/nor/at91sam4l.c +++ b/src/flash/nor/at91sam4l.c @@ -35,7 +35,7 @@ #define SAM4L_NUM_SECTORS 16 /* Locations in memory map */ -#define SAM4L_FLASH 0x00000000 /* Flash region */ +#define SAM4L_FLASH ((uint32_t)0x00000000) /* Flash region */ #define SAM4L_FLASH_USER 0x00800000 /* Flash user page region */ #define SAM4L_FLASHCALW 0x400A0000 /* Flash controller */ #define SAM4L_CHIPID 0x400E0740 /* Chip Identification */ @@ -253,7 +253,7 @@ static int sam4l_check_page_erased(struct flash_bank *bank, uint32_t pn, /* Issue a quick page read to verify that we've erased this page */ res = sam4l_flash_command(bank->target, SAM4L_FCMD_QPR, pn); if (res != ERROR_OK) { - LOG_ERROR("Quick page read %d failed", pn); + LOG_ERROR("Quick page read %" PRIu32 " failed", pn); return res; } @@ -307,7 +307,7 @@ static int sam4l_probe(struct flash_bank *bank) chip->flash_kb = 512; break; default: - LOG_ERROR("Unknown flash size (chip ID is %08X), assuming 128K", id); + LOG_ERROR("Unknown flash size (chip ID is %08" PRIx32 "), assuming 128K", id); chip->flash_kb = 128; break; } @@ -351,8 +351,8 @@ static int sam4l_probe(struct flash_bank *bank) /* Done */ chip->probed = true; - LOG_INFO("SAM4L MCU: %s (Rev %c) (%uKB Flash with %d %dB pages, %uKB RAM)", - chip->details ? chip->details->name : "unknown", 'A' + (id & 0xF), + LOG_INFO("SAM4L MCU: %s (Rev %c) (%" PRIu32 "KB Flash with %d %" PRId32 "B pages, %" PRIu32 "KB RAM)", + chip->details ? chip->details->name : "unknown", (char)('A' + (id & 0xF)), chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb); return ERROR_OK; diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c index bfd2c6ab..17bc8b99 100644 --- a/src/flash/nor/at91samd.c +++ b/src/flash/nor/at91samd.c @@ -26,7 +26,7 @@ #define SAMD_NUM_SECTORS 16 -#define SAMD_FLASH 0x00000000 /* physical Flash memory */ +#define SAMD_FLASH ((uint32_t)0x00000000) /* physical Flash memory */ #define SAMD_DSU 0x41002000 /* Device Service Unit */ #define SAMD_NVMCTRL 0x41004000 /* Non-volatile memory controller */ @@ -218,7 +218,7 @@ static int samd_probe(struct flash_bank *bank) * multiplied by the number of pages. */ if (bank->size != chip->num_pages * chip->page_size) { LOG_WARNING("SAMD: bank size doesn't match NVM parameters. " - "Identified %uKB Flash but NVMCTRL reports %u %uB pages", + "Identified %" PRIu32 "KB Flash but NVMCTRL reports %u %" PRIu32 "B pages", part->flash_kb, chip->num_pages, chip->page_size); } @@ -243,7 +243,7 @@ static int samd_probe(struct flash_bank *bank) /* Done */ chip->probed = true; - LOG_INFO("SAMD MCU: %s (%uKB Flash, %uKB RAM)", part->name, + LOG_INFO("SAMD MCU: %s (%" PRIu32 "KB Flash, %" PRIu32 "KB RAM)", part->name, part->flash_kb, part->ram_kb); return ERROR_OK; @@ -337,7 +337,7 @@ static int samd_erase_row(struct flash_bank *bank, uint32_t address) } if (res != ERROR_OK || error) { - LOG_ERROR("Failed to erase row containing %08X" PRIx32, address); + LOG_ERROR("Failed to erase row containing %08" PRIx32, address); return ERROR_FAIL; } |