X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=d362c6490ab4c2e8d46cd6768d83f005834df0c3;hb=6d0aa6dc05ce83941d59eb6c3617b35f7595cf2c;hp=81aae3909de5d0cd70053d5942f880192ff24fd4;hpb=6ae83f5cf8ddf505498b535cb167550a54271606;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 81aae3909d..d362c6490a 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-09-05 09:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
 	register_command(cmd_ctx, NULL, "version", handle_version_command,
 					 COMMAND_EXEC, "show OpenOCD version");
-	
+
 	/* register subsystem commands */
 	server_register_commands(cmd_ctx);
 	telnet_register_commands(cmd_ctx);
@@ -90,7 +90,11 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	DEBUG("log init complete");
 	
-	INFO( OPENOCD_VERSION );
+	printf( OPENOCD_VERSION );
+	printf( "\n$URL$\n");
+  
+	DEBUG( OPENOCD_VERSION );
+	DEBUG( "$URL$");
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -116,7 +120,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	DEBUG("target init complete");
 
-	if (flash_init(cmd_ctx) != ERROR_OK)
+	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
 	DEBUG("flash init complete");
 
@@ -130,19 +134,24 @@ int main(int argc, char *argv[])
 
 	/* initialize tcp server */
 	server_init();
-	
+
 	/* initialize telnet subsystem */
 	telnet_init("Open On-Chip Debugger");
 	gdb_init();
 
+	/* call any target resets */
+	if (target_init_reset(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+	DEBUG("target init reset complete");
+
 	/* handle network connections */
 	server_loop(cmd_ctx);
-	
+
 	/* shut server down */
 	server_quit();
-	
+
 	/* free commandline interface */
 	command_done(cmd_ctx);
-	
+
 	return EXIT_SUCCESS;
 }