MIPS: make fixed code arrays static const

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 0ae0d19f3537bdb87217790db09ab69944a9c406..78336068d586ba8aaab51ae8ee929233f84092ab 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -34,7 +34,8 @@
 #include <helper/configuration.h>
 #include <xsvf/xsvf.h>
 #include <svf/svf.h>
-#include <flash/nand.h>
+#include <flash/nor/core.h>
+#include <flash/nand/core.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>
 
@@ -61,7 +62,6 @@ COMMAND_HANDLER(handle_version_command)
        return ERROR_OK;
 }
 
-
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
        switch (event)
@@ -202,7 +202,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 
        /* register subsystem commands */
        typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
-       command_registrant_t command_registrants[] = {
+       static const command_registrant_t command_registrants[] = {
                &openocd_register_commands,
                &server_register_commands,
                &gdb_register_commands,
@@ -228,7 +228,8 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
        }
        LOG_DEBUG("command registration: complete");
 
-       LOG_OUTPUT(OPENOCD_VERSION "\n");
+       LOG_OUTPUT(OPENOCD_VERSION "\n"
+                       "Licensed under GNU GPL v2\n");
 
        global_cmd_ctx = cmd_ctx;
 
@@ -254,13 +255,15 @@ int openocd_main(int argc, char *argv[])
                "http://openocd.berlios.de/doc/doxygen/bugs.html"
                "\n");
 
-
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
        if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
 
+       if (server_preinit() != ERROR_OK)
+               return EXIT_FAILURE;
+
        ret = parse_config_file(cmd_ctx);
        if (ret != ERROR_OK)
                return EXIT_FAILURE;