X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=026880c67f9ddfd9e7bff00808859ace8c894316;hp=dbac9a1fba0ebaf340a51ad191fb296e6a80cd1d;hb=549d9bc72cbca3ba352e6b4bcd6e31d9fd9a0bc7;hpb=30aacc0564dc200ab3397d7f7c05dab932bed85b

diff --git a/src/target/target.c b/src/target/target.c
index dbac9a1fba..026880c67f 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -822,6 +822,7 @@ int target_run_flash_async_algorithm(struct target *target,
 		uint32_t entry_point, uint32_t exit_point, void *arch_info)
 {
 	int retval;
+	int timeout = 0;
 
 	/* Set up working area. First word is write pointer, second word is read pointer,
 	 * rest is fifo data area. */
@@ -893,9 +894,19 @@ int target_run_flash_async_algorithm(struct target *target,
 			 * less than buffer size / flash speed. This is very unlikely to
 			 * run when using high latency connections such as USB. */
 			alive_sleep(10);
+
+			/* to stop an infinite loop on some targets check and increment a timeout
+			 * this issue was observed on a stellaris using the new ICDI interface */
+			if (timeout++ >= 500) {
+				LOG_ERROR("timeout waiting for algorithm, a target reset is recommended");
+				return ERROR_FLASH_OPERATION_FAILED;
+			}
 			continue;
 		}
 
+		/* reset our timeout */
+		timeout = 0;
+
 		/* Limit to the amount of data we actually want to write */
 		if (thisrun_bytes > count * block_size)
 			thisrun_bytes = count * block_size;
@@ -4447,32 +4458,32 @@ static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 			return JIM_ERR;
 		}
 
-		command_print(NULL, "0x%08x ", (int)(addr));
+		command_print_sameline(NULL, "0x%08x ", (int)(addr));
 		switch (dwidth) {
 		case 4:
 			for (x = 0; x < 16 && x < y; x += 4) {
 				z = target_buffer_get_u32(target, &(target_buf[x]));
-				command_print(NULL, "%08x ", (int)(z));
+				command_print_sameline(NULL, "%08x ", (int)(z));
 			}
 			for (; (x < 16) ; x += 4)
-				command_print(NULL, "         ");
+				command_print_sameline(NULL, "         ");
 			break;
 		case 2:
 			for (x = 0; x < 16 && x < y; x += 2) {
 				z = target_buffer_get_u16(target, &(target_buf[x]));
-				command_print(NULL, "%04x ", (int)(z));
+				command_print_sameline(NULL, "%04x ", (int)(z));
 			}
 			for (; (x < 16) ; x += 2)
-				command_print(NULL, "     ");
+				command_print_sameline(NULL, "     ");
 			break;
 		case 1:
 		default:
 			for (x = 0 ; (x < 16) && (x < y) ; x += 1) {
 				z = target_buffer_get_u8(target, &(target_buf[x]));
-				command_print(NULL, "%02x ", (int)(z));
+				command_print_sameline(NULL, "%02x ", (int)(z));
 			}
 			for (; (x < 16) ; x += 1)
-				command_print(NULL, "   ");
+				command_print_sameline(NULL, "   ");
 			break;
 		}
 		/* ascii-ify the bytes */
@@ -4493,7 +4504,7 @@ static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		/* terminate */
 		target_buf[16] = 0;
 		/* print - with a newline */
-		command_print(NULL, "%s\n", target_buf);
+		command_print_sameline(NULL, "%s\n", target_buf);
 		/* NEXT... */
 		bytes -= 16;
 		addr += 16;
@@ -4898,6 +4909,15 @@ static int target_create(Jim_GetOptInfo *goi)
 			/* found */
 			break;
 		}
+
+		/* check for deprecated name */
+		if (target_types[x]->deprecated_name) {
+			if (0 == strcmp(cp, target_types[x]->deprecated_name)) {
+				/* found */
+				LOG_WARNING("target name is deprecated use: \'%s\'", target_types[x]->name);
+				break;
+			}
+		}
 	}
 	if (target_types[x] == NULL) {
 		Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
@@ -5131,8 +5151,10 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		target->head = head;
 		curr = curr->next;
 	}
-	if (target->rtos)
+
+	if (target && target->rtos)
 		retval = rtos_smp_init(head->target);
+
 	return retval;
 }