nrf51: verify that UICR needs erasing before triggering an error about it

[openocd.git] / src / flash / nor / at91sam4l.c

diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c
index d3bdbfe67b8227d63adc520d78387cfc7886366b..a5eb67271494c57c08047206689b44e36e3e2c50 100644 (file)
--- 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;
@@ -495,10 +495,12 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
 /* Write an entire page from host buffer 'buf' to page-aligned 'address' in the
  * Flash. */
 static int sam4l_write_page(struct sam4l_info *chip, struct target *target,
-               uint32_t address, uint8_t *buf)
+               uint32_t address, const uint8_t *buf)
 {
        int res;
 
+       LOG_DEBUG("sam4l_write_page address=%08" PRIx32, address);
+
        /* Clear the page buffer before we write to it */
        res = sam4l_flash_command(target, SAM4L_FCMD_CPB, -1);
        if (res != ERROR_OK) {
@@ -527,7 +529,7 @@ static int sam4l_write_page(struct sam4l_info *chip, struct target *target,
 /* Write partial contents into page-aligned 'address' on the Flash from host
  * buffer 'buf' by writing 'nb' of 'buf' at 'offset' into the Flash page. */
 static int sam4l_write_page_partial(struct sam4l_info *chip,
-               struct flash_bank *bank, uint32_t address, uint8_t *buf,
+               struct flash_bank *bank, uint32_t address, const uint8_t *buf,
                uint32_t page_offset, uint32_t nb)
 {
        int res;
@@ -535,6 +537,8 @@ static int sam4l_write_page_partial(struct sam4l_info *chip,
        if (!pg)
                return ERROR_FAIL;
 
+       LOG_DEBUG("sam4l_write_page_partial address=%08" PRIx32 " nb=%08" PRIx32, address, nb);
+
        assert(page_offset + nb < chip->page_size);
        assert((address % chip->page_size) == 0);
 
@@ -556,13 +560,15 @@ static int sam4l_write_page_partial(struct sam4l_info *chip,
        return res;
 }
 
-static int sam4l_write(struct flash_bank *bank, uint8_t *buffer,
+static int sam4l_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        int res;
        uint32_t nb = 0;
        struct sam4l_info *chip = (struct sam4l_info *)bank->driver_priv;
 
+       LOG_DEBUG("sam4l_write offset=%08" PRIx32 " count=%08" PRIx32, offset, count);
+
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
 
@@ -605,14 +611,14 @@ static int sam4l_write(struct flash_bank *bank, uint8_t *buffer,
                for (int i = 0; i < np; i++) {
                        if (count >= chip->page_size) {
                                res = sam4l_write_page(chip, bank->target,
-                                               bank->base + (i * chip->page_size),
+                                               bank->base + offset,
                                                buffer + (i * chip->page_size));
                                /* Advance one page */
                                offset += chip->page_size;
                                count -= chip->page_size;
                        } else {
                                res = sam4l_write_page_partial(chip, bank,
-                                               bank->base + (i * chip->page_size),
+                                               bank->base + offset,
                                                buffer + (i * chip->page_size), 0, count);
                                /* We're done after this. */
                                offset += count;