- added support for pseudo image type "mem", currently only used for etm analysis...

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 27ca8327d8d6bc0613cdb5720e4186f83fbde0d6..76cc3d8d6d7ce8ff247196e333cf7680d66eadb5 100644 (file)
--- 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 (2006-08-17 17:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-06-15 16:00 CEST)"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,8 @@
 #include "xsvf.h"
 #include "target.h"
 #include "flash.h"
+#include "nand.h"
+#include "pld.h"
 
 #include "command.h"
 #include "server.h"
@@ -74,6 +76,8 @@ int main(int argc, char *argv[])
        xsvf_register_commands(cmd_ctx);
        target_register_commands(cmd_ctx);
        flash_register_commands(cmd_ctx);
+       nand_register_commands(cmd_ctx);
+       pld_register_commands(cmd_ctx);
        
        if (log_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
@@ -93,6 +97,8 @@ int main(int argc, char *argv[])
        
        command_done(cfg_cmd_ctx);
 
+       command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
        if (jtag_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
        DEBUG("jtag init complete");
@@ -105,6 +111,14 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        DEBUG("flash init complete");
 
+       if (nand_init(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
+       DEBUG("NAND init complete");
+
+       if (pld_init(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
+       DEBUG("pld init complete");
+
        /* initialize tcp server */
        server_init();