root/openocd
2
0
Fork 0
mirror of git://git.code.sf.net/p/openocd/code synced 2025-07-19 05:55:41 +10:00
Code Issues Releases Wiki Activity

- added -c option that will execute an openocd command

Browse Source 
- added at91eb40a target library example.

git-svn-id: svn://svn.berlios.de/openocd/trunk@333 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-02-24 20:10:48 +00:00
parent 1aa854684d
commit 90697ca389
5 changed files with 273 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/helper/Makefile.am
View File

@ -1,8 +1,8 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @CPPFLAGS@ AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
noinst_LIBRARIES = libhelper.a noinst_LIBRARIES = libhelper.a
libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c \ libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c \
replacements.c fileio.c replacements.c fileio.c
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \ noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
interpreter.h time_support.h replacements.h fileio.h interpreter.h time_support.h replacements.h fileio.h

399
src/helper/configuration.c
View File

@ -1,199 +1,200 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2004, 2005 by Dominic Rath * * Copyright (C) 2004, 2005 by Dominic Rath *
* Dominic.Rath@gmx.de * * Dominic.Rath@gmx.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include "types.h" #include "types.h"
#include "command.h" #include "command.h"
#include "configuration.h" #include "configuration.h"
#include "log.h" #include "log.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <string.h> #include <string.h>
static size_t num_config_files; static size_t num_config_files;
static char** config_file_names; static char** config_file_names;
static size_t num_script_dirs; static size_t num_script_dirs;
static char** script_search_dirs; static char** script_search_dirs;
static int help_flag; static int help_flag;
static struct option long_options[] = static struct option long_options[] =
{ {
{"help", no_argument, &help_flag, 1}, {"help", no_argument, &help_flag, 1},
{"debug", optional_argument, 0, 'd'}, {"debug", optional_argument, 0, 'd'},
{"file", required_argument, 0, 'f'}, {"file", required_argument, 0, 'f'},
{"search", required_argument, 0, 's'}, {"search", required_argument, 0, 's'},
{"log_output", required_argument, 0, 'l'}, {"log_output", required_argument, 0, 'l'},
{"command", required_argument, 0, 'c'},
{0, 0, 0, 0}
}; {0, 0, 0, 0}
};
int configuration_output_handler(struct command_context_s *context, char* line)
{ int configuration_output_handler(struct command_context_s *context, char* line)
INFO(line); {
INFO(line);
return ERROR_OK;
} return ERROR_OK;
}
void add_script_search_dir (const char *dir)
{ void add_script_search_dir (const char *dir)
num_script_dirs++; {
script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *)); num_script_dirs++;
script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *));
script_search_dirs[num_script_dirs-1] = strdup(dir);
script_search_dirs[num_script_dirs] = NULL; script_search_dirs[num_script_dirs-1] = strdup(dir);
} script_search_dirs[num_script_dirs] = NULL;
}
void add_config_file_name (const char *cfg)
{ void add_config_file_name (const char *cfg)
num_config_files++; {
config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *)); num_config_files++;
config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
config_file_names[num_config_files-1] = strdup(cfg);
config_file_names[num_config_files] = NULL; config_file_names[num_config_files-1] = strdup(cfg);
} config_file_names[num_config_files] = NULL;
}
int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
{ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
int c; {
char command_buffer[128]; int c;
char command_buffer[128];
while (1)
{ while (1)
/* getopt_long stores the option index here. */ {
int option_index = 0; /* getopt_long stores the option index here. */
int option_index = 0;
c = getopt_long(argc, argv, "hd::l:f:s:", long_options, &option_index);
c = getopt_long(argc, argv, "hd::l:f:s:c:", long_options, &option_index);
/* Detect the end of the options. */
if (c == -1) /* Detect the end of the options. */
break; if (c == -1)
break;
switch (c)
{ switch (c)
case 0: {
break; case 0:
case 'h': /* --help | -h */ break;
help_flag = 1; case 'h': /* --help | -h */
break; help_flag = 1;
case 'f': /* --file | -f */ break;
add_config_file_name(optarg); case 'f': /* --file | -f */
break; snprintf(command_buffer, 128, "script %s", optarg);
case 's': /* --search | -s */ add_config_file_name(command_buffer);
add_script_search_dir(optarg); break;
break; case 's': /* --search | -s */
case 'd': /* --debug | -d */ add_script_search_dir(optarg);
if (optarg) break;
snprintf(command_buffer, 128, "debug_level %s", optarg); case 'd': /* --debug | -d */
else if (optarg)
snprintf(command_buffer, 128, "debug_level 3"); snprintf(command_buffer, 128, "debug_level %s", optarg);
command_run_line(cmd_ctx, command_buffer); else
break; snprintf(command_buffer, 128, "debug_level 3");
case 'l': /* --log_output | -l */ command_run_line(cmd_ctx, command_buffer);
if (optarg) break;
{ case 'l': /* --log_output | -l */
snprintf(command_buffer, 128, "log_output %s", optarg); if (optarg)
command_run_line(cmd_ctx, command_buffer); {
} snprintf(command_buffer, 128, "log_output %s", optarg);
break; command_run_line(cmd_ctx, command_buffer);
} }
} break;
case 'c': /* --command | -c */
if (help_flag) if (optarg)
{ {
printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n"); add_config_file_name(optarg);
printf("--help | -h\tdisplay this help\n"); }
printf("--file | -f\tuse configuration file <name>\n"); break;
printf("--search | -s\tdir to search for config files and scripts.\n");
printf("--debug | -d\tset debug level <0-3>\n"); }
printf("--log_output | -l\tredirect log output to file <name>\n"); }
exit(-1);
} if (help_flag)
{
/* Add dir for openocd supplied scripts last so that user can over printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");
ride those scripts if desired. */ printf("--help | -h\tdisplay this help\n");
add_script_search_dir(PKGDATADIR); printf("--file | -f\tuse configuration file <name>\n");
printf("--search | -s\tdir to search for config files and scripts.\n");
return ERROR_OK; printf("--debug | -d\tset debug level <0-3>\n");
} printf("--log_output | -l\tredirect log output to file <name>\n");
printf("--command | -c\trun <command>\n");
FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode) exit(-1);
{ }
FILE *fp = NULL;
char **search_dirs = script_search_dirs; /* Add dir for openocd supplied scripts last so that user can over
char *dir; ride those scripts if desired. */
char full_path[1024]; add_script_search_dir(PKGDATADIR);
add_script_search_dir(PKGLIBDIR);
/* Check absolute and relative to current working dir first.
* This keeps full_path reporting belowing working. */ return ERROR_OK;
snprintf(full_path, 1024, "%s", file); }
fp = fopen(full_path, mode);
FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode)
while (!fp) {
{ FILE *fp = NULL;
dir = *search_dirs++; char **search_dirs = script_search_dirs;
char *dir;
if (!dir) char full_path[1024];
break;
/* Check absolute and relative to current working dir first.
snprintf(full_path, 1024, "%s/%s", dir, file); * This keeps full_path reporting belowing working. */
fp = fopen(full_path, mode); snprintf(full_path, 1024, "%s", file);
} fp = fopen(full_path, mode);
if (fp) while (!fp)
command_print(cmd_ctx, "opened %s", full_path); {
dir = *search_dirs++;
return fp;
} if (!dir)
break;
int parse_config_file(struct command_context_s *cmd_ctx)
{ snprintf(full_path, 1024, "%s/%s", dir, file);
char **cfg; fp = fopen(full_path, mode);
FILE *config_file; }
if (!config_file_names) if (fp)
add_config_file_name ("openocd.cfg"); command_print(cmd_ctx, "opened %s", full_path);
cfg = config_file_names; return fp;
}
while (*cfg)
{ int parse_config_file(struct command_context_s *cmd_ctx)
config_file = open_file_from_path(cmd_ctx, *cfg, "r"); {
if (!config_file) char **cfg;
{ FILE *config_file;
ERROR("couldn't open config file");
return ERROR_NO_CONFIG_FILE; if (!config_file_names)
} add_config_file_name ("script openocd.cfg");
command_run_file(cmd_ctx, config_file, COMMAND_CONFIG); cfg = config_file_names;
fclose(config_file); while (*cfg)
{
cfg++; command_run_line(cmd_ctx, *cfg);
} cfg++;
}
return ERROR_OK;
} return ERROR_OK;
}

45
src/target/Makefile.am
View File

@ -1,22 +1,23 @@
if OOCD_TRACE if OOCD_TRACE
OOCD_TRACE_FILES = oocd_trace.c OOCD_TRACE_FILES = oocd_trace.c
else else
OOCD_TRACE_FILES = OOCD_TRACE_FILES =
endif endif
INCLUDES = -I$(top_srcdir)/src/gdb -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/xsvf $(all_includes) INCLUDES = -I$(top_srcdir)/src/gdb -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/xsvf $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@ AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
noinst_LIBRARIES = libtarget.a noinst_LIBRARIES = libtarget.a
libtarget_a_SOURCES = target.c register.c breakpoints.c armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \ libtarget_a_SOURCES = target.c register.c breakpoints.c armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \
arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \ arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \
arm966e.c arm926ejs.c feroceon.c etb.c xscale.c arm_simulator.c image.c armv7m.c cortex_m3.c cortex_swjdp.c \ arm966e.c arm926ejs.c feroceon.c etb.c xscale.c arm_simulator.c image.c armv7m.c cortex_m3.c cortex_swjdp.c \
etm_dummy.c $(OOCD_TRACE_FILES) target_request.c trace.c etm_dummy.c $(OOCD_TRACE_FILES) target_request.c trace.c
noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7tdmi.h arm9tdmi.h \ noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7tdmi.h arm9tdmi.h \
arm_jtag.h arm7_9_common.h arm920t.h arm720t.h armv4_5_mmu.h armv4_5_cache.h breakpoints.h algorithm.h \ arm_jtag.h arm7_9_common.h arm920t.h arm720t.h armv4_5_mmu.h armv4_5_cache.h breakpoints.h algorithm.h \
arm_disassembler.h arm966e.h arm926ejs.h etb.h xscale.h arm_simulator.h image.h armv7m.h cortex_m3.h cortex_swjdp.h \ arm_disassembler.h arm966e.h arm926ejs.h etb.h xscale.h arm_simulator.h image.h armv7m.h cortex_m3.h cortex_swjdp.h \
etm_dummy.h oocd_trace.h target_request.h trace.h etm_dummy.h oocd_trace.h target_request.h trace.h
nobase_dist_pkglib_DATA = xscale/debug_handler.bin nobase_dist_pkglib_DATA = xscale/debug_handler.bin event/at91eb40a_reset.cfg target/at91eb40a.cfg

8
src/target/event/at91eb40a_reset.cfg Normal file
View File

@ -0,0 +1,8 @@
# Reset script for AT91EB40a
reg cpsr 0x000000D3
mww 0xFFE00020 0x1
mww 0xFFE00024 0x00000000
mww 0xFFE00000 0x01002539
mww 0xFFFFF124 0xFFFFFFFF
mww 0xffff0010 0x100
mww 0xffff0034 0x100

34
src/target/target/at91eb40a.cfg Normal file
View File

@ -0,0 +1,34 @@
#Script for AT91EB40a
#Atmel ties SRST & TRST together, at which point it makes
#no sense to use TRST, but use TMS instead.
#
#The annoying thing with tying SRST & TRST together is that
#there is no way to halt the CPU *before and during* the
#SRST reset, which means that the CPU will run a number
#of cycles before it can be halted(as much as milliseconds).
reset_config srst_only srst_pulls_trst
#jtag scan chain
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
jtag_device 4 0x1 0xf 0xe
#target configuration
#target arm7tdmi <endianness> <reset mode> <chainpos> <variant>
target arm7tdmi little reset_init 0 arm7tdmi-s_r4
# speed up memory downloads
arm7 fast_memory_access enable
arm7_9 dcc_downloads enable
# OpenOCD does not have a flash driver for for AT91FR40162S
target_script 0 reset event/at91eb40a_reset.cfg
# required for usable performance. Used for lots of
# other things than flash programming.
working_area 0 0x00000000 0x20000 nobackup
#force hardware values - we're running out of flash more
#often than not. The user can disable this in his
#subsequent config script.
arm7_9 force_hw_bkpts enable