X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fat91sam4.c;h=446f7983b7971c531ecd31dcc919f64f208ea914;hp=577360a6ee71d4e8267dbc6da58161ad9d670624;hb=80ca927ebc2bb1ca18aff70215222d55c1f196f8;hpb=d78cf6f3126b0c28321d36614e184912dfc0c609

diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 577360a6ee..446f7983b7 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -103,7 +103,7 @@
 #define  offset_EFC_FSR   8
 #define  offset_EFC_FRR   12
 
-extern struct flash_driver at91sam4_flash;
+extern const struct flash_driver at91sam4_flash;
 
 static float _tomhz(uint32_t freq_hz)
 {
@@ -2598,7 +2598,7 @@ static int sam4_info(struct flash_bank *bank, char *buf, int buf_size)
 	}
 
 	snprintf(buf, buf_size,
-		"%s bank %d: %d kB at 0x%08" PRIx32,
+		"%s bank %d: %d kB at " TARGET_ADDR_FMT,
 		pPrivate->pChip->details.name,
 		pPrivate->bank_number,
 		k,
@@ -2642,7 +2642,9 @@ static int sam4_probe(struct flash_bank *bank)
 	for (x = 0; x < SAM4_MAX_FLASH_BANKS; x++) {
 		if (bank->base == pPrivate->pChip->details.bank[x].base_address) {
 			bank->size = pPrivate->pChip->details.bank[x].size_bytes;
-			LOG_DEBUG("SAM4 Set flash bank to %08X - %08X, idx %d", bank->base, bank->base + bank->size, x);
+			LOG_DEBUG("SAM4 Set flash bank to " TARGET_ADDR_FMT " - "
+					TARGET_ADDR_FMT ", idx %d", bank->base,
+					bank->base + bank->size, x);
 			break;
 		}
 	}
@@ -3131,7 +3133,8 @@ showall:
 		}
 		if ((who >= 0) && (((unsigned)(who)) < pChip->details.n_gpnvms)) {
 			r = FLASHD_GetGPNVM(&(pChip->details.bank[0]), who, &v);
-			command_print(CMD_CTX, "sam4-gpnvm%u: %u", who, v);
+			if (r == ERROR_OK)
+				command_print(CMD_CTX, "sam4-gpnvm%u: %u", who, v);
 			return r;
 		} else {
 			command_print(CMD_CTX, "sam4-gpnvm invalid GPNVM: %u", who);
@@ -3231,7 +3234,7 @@ static const struct command_registration at91sam4_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver at91sam4_flash = {
+const struct flash_driver at91sam4_flash = {
 	.name = "at91sam4",
 	.commands = at91sam4_command_handlers,
 	.flash_bank_command = sam4_flash_bank_command,