X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=92305fb73cd46eef8c851801dafb4e8853235be7;hp=b20ffd23c83f732f44fa385fca0e3d6621ddae90;hb=3041bb26edc88320ce9bb0fc000ea5c2e1e66ebf;hpb=df4b030df770e905aae573b4825d62b3efc96515

diff --git a/src/openocd.c b/src/openocd.c
index b20ffd23c8..92305fb73c 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-07-26 11:30 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -60,7 +60,8 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
 void exit_handler(void)
 {
 	/* close JTAG interface */
-	if (jtag && jtag->quit) jtag->quit();
+	if (jtag && jtag->quit)
+		jtag->quit();
 }
 
 int main(int argc, char *argv[])
@@ -90,6 +91,7 @@ int main(int argc, char *argv[])
 	DEBUG("log init complete");
 	
 	INFO( OPENOCD_VERSION );
+	INFO( "$URL$");
 
 	cfg_cmd_ctx = copy_command_context(cmd_ctx);
 	cfg_cmd_ctx->mode = COMMAND_CONFIG;
@@ -115,7 +117,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");