X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fpsoc6.c;fp=src%2Fflash%2Fnor%2Fpsoc6.c;h=df151c1b5eac63f14c040f8187ef5d38d32081fe;hp=09a1bed563a8898caa27269643f2e812a3323d62;hb=e66593f8242d49dd05f6b9c4a5121fa466a158aa;hpb=2f62883161fe4cdc32826a7bc6826ad82516233e

diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index 09a1bed563..df151c1b5e 100644
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -378,7 +378,7 @@ static int call_sromapi(struct target *target,
 
 	bool is_success = (*data_out & SROMAPI_STATUS_MSK) == SROMAPI_STAT_SUCCESS;
 	if (!is_success) {
-		LOG_ERROR("SROM API execution failed. Status: 0x%08X", (uint32_t)*data_out);
+		LOG_ERROR("SROM API execution failed. Status: 0x%08" PRIX32, *data_out);
 		return ERROR_TARGET_FAILURE;
 	}
 
@@ -513,9 +513,9 @@ static int psoc6_get_info(struct flash_bank *bank, char *buf, int buf_size)
 		return hr;
 
 	snprintf(buf, buf_size,
-		"PSoC6 Silicon ID: 0x%08X\n"
+		"PSoC6 Silicon ID: 0x%08" PRIX32 "\n"
 		"Protection: %s\n"
-		"Main Flash size: %d kB\n"
+		"Main Flash size: %" PRIu32 " kB\n"
 		"Work Flash size: 32 kB\n",
 		psoc6_info->silicon_id,
 		protection_to_str(psoc6_info->protection),
@@ -660,7 +660,7 @@ static int psoc6_erase_sector(struct flash_bank *bank, struct working_area *wa,
 {
 	struct target *target = bank->target;
 
-	LOG_DEBUG("Erasing SECTOR @%08X", addr);
+	LOG_DEBUG("Erasing SECTOR @%08" PRIX32, addr);
 
 	int hr = target_write_u32(target, wa->address, SROMAPI_ERASESECTOR_REQ);
 	if (hr != ERROR_OK)
@@ -673,7 +673,7 @@ static int psoc6_erase_sector(struct flash_bank *bank, struct working_area *wa,
 	uint32_t data_out;
 	hr = call_sromapi(target, SROMAPI_ERASESECTOR_REQ, wa->address, &data_out);
 	if (hr != ERROR_OK)
-		LOG_ERROR("SECTOR @%08X not erased!", addr);
+		LOG_ERROR("SECTOR @%08" PRIX32 " not erased!", addr);
 
 	return hr;
 }
@@ -689,7 +689,7 @@ static int psoc6_erase_row(struct flash_bank *bank, struct working_area *wa, uin
 {
 	struct target *target = bank->target;
 
-	LOG_DEBUG("Erasing ROW @%08X", addr);
+	LOG_DEBUG("Erasing ROW @%08" PRIX32, addr);
 
 	int hr = target_write_u32(target, wa->address, SROMAPI_ERASEROW_REQ);
 	if (hr != ERROR_OK)
@@ -702,7 +702,7 @@ static int psoc6_erase_row(struct flash_bank *bank, struct working_area *wa, uin
 	uint32_t data_out;
 	hr = call_sromapi(target, SROMAPI_ERASEROW_REQ, wa->address, &data_out);
 	if (hr != ERROR_OK)
-		LOG_ERROR("ROW @%08X not erased!", addr);
+		LOG_ERROR("ROW @%08" PRIX32 " not erased!", addr);
 
 	return hr;
 }
@@ -792,7 +792,7 @@ static int psoc6_program_row(struct flash_bank *bank,
 	uint32_t data_out;
 	int hr = ERROR_OK;
 
-	LOG_DEBUG("Programming ROW @%08X", addr);
+	LOG_DEBUG("Programming ROW @%08" PRIX32, addr);
 
 	hr = target_alloc_working_area(target, psoc6_info->row_sz + 32, &wa);
 	if (hr != ERROR_OK)
@@ -863,7 +863,7 @@ static int psoc6_program(struct flash_bank *bank,
 
 		hr = psoc6_program_row(bank, aligned_addr, page_buf, is_sflash);
 		if (hr != ERROR_OK) {
-			LOG_ERROR("Failed to program Flash at address 0x%08X", aligned_addr);
+			LOG_ERROR("Failed to program Flash at address 0x%08" PRIX32, aligned_addr);
 			goto exit;
 		}
 
@@ -959,11 +959,11 @@ int handle_reset_halt(struct target *target)
 	 * Ignoring return value of mem_ap_write_atomic_u32 seems to be ok here */
 	if (is_cm0) {
 		/* Reset the CM0 by asserting SYSRESETREQ. This will also reset CM4 */
-		LOG_INFO("psoc6.cm0: bkpt @0x%08X, issuing SYSRESETREQ", reset_addr);
+		LOG_INFO("psoc6.cm0: bkpt @0x%08" PRIX32 ", issuing SYSRESETREQ", reset_addr);
 		mem_ap_write_atomic_u32(cm->debug_ap, NVIC_AIRCR,
 			AIRCR_VECTKEY | AIRCR_SYSRESETREQ);
 	} else {
-		LOG_INFO("psoc6.cm4: bkpt @0x%08X, issuing VECTRESET", reset_addr);
+		LOG_INFO("psoc6.cm4: bkpt @0x%08" PRIX32 ", issuing VECTRESET", reset_addr);
 		mem_ap_write_atomic_u32(cm->debug_ap, NVIC_AIRCR,
 			AIRCR_VECTKEY | AIRCR_VECTRESET);
 	}