X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=79a30e77e176e4fb44a4f2a6303e1bcdd8a65fa5;hb=ac1887c703d0d5ae83c513df61127f59e44a0469;hp=44e029251aa6c05eafd0a148c2631e3800989a3b;hpb=5576a6240a103879e1a8d9d4c2b6ff4aee0d23fa;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 44e029251a..79a30e77e1 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -126,30 +126,30 @@ COMMAND_HANDLER(handle_init_command)
 
 	/* Try to initialize & examine the JTAG chain at this point, but
 	 * continue startup regardless */
-	if (jtag_init(CMD_CTX) == ERROR_OK)
+	command_context_mode(CMD_CTX, COMMAND_CONFIG);
+	if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
 	{
-		LOG_DEBUG("jtag init complete");
-		if (target_examine() == ERROR_OK)
-		{
-			LOG_DEBUG("jtag examine complete");
-		}
+		command_context_mode(CMD_CTX, COMMAND_EXEC);
+		LOG_DEBUG("Examining targets...");
+		if (target_examine() != ERROR_OK)
+			LOG_DEBUG("target examination failed");
+		command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	}
+	else
+		LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
 
-	if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("flash init complete");
 
-	if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("mflash init complete");
 
-	if (nand_init(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("NAND init complete");
 
-	if (pld_init(CMD_CTX) != ERROR_OK)
+	if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("pld init complete");
+	command_context_mode(CMD_CTX, COMMAND_EXEC);
 
 	/* initialize telnet subsystem */
 	gdb_target_add_all(all_targets);