X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=4fbaf467e83f3ce939116c02f161eb09a31d7ee3;hb=5ed126c4f90948fbf53d186dc4ef49018fb5ecfc;hp=3abc609e1438f838252e7c0373bd2bd2f865c125;hpb=e9297b40b994f071474210e7d9e224d50e25fcaf;p=openocd.git diff --git a/src/openocd.c b/src/openocd.c index 3abc609e14..4fbaf467e8 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 (2006-11-22 14:00 CEST)" +#define OPENOCD_VERSION "Open On-Chip Debugger (2007-03-15 14:30 CET)" #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,6 +32,7 @@ #include "xsvf.h" #include "target.h" #include "flash.h" +#include "nand.h" #include "pld.h" #include "command.h" @@ -75,6 +76,7 @@ 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) @@ -109,6 +111,10 @@ 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");