Browse Source

chain position is now required when creating a target

git-svn-id: svn://svn.berlios.de/openocd/trunk@1363 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.2.0
oharboe 15 years ago
parent
commit
ce1a29725f
3 changed files with 41 additions and 0 deletions
  1. +3
    -0
      src/target/Makefile.am
  2. +9
    -0
      src/target/target.c
  3. +29
    -0
      src/target/test/syntax1.cfg

+ 3
- 0
src/target/Makefile.am View File

@@ -29,4 +29,7 @@ nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/interface/*.cfg)
# Various preconfigured boards # Various preconfigured boards
nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/board/*.cfg) nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/board/*.cfg)


# test files
nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/test/*.cfg)

MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

+ 9
- 0
src/target/target.c View File

@@ -3341,6 +3341,8 @@ static int target_configure( Jim_GetOptInfo *goi, target_t *target )
break; break;
} }
} /* while( goi->argc ) */ } /* while( goi->argc ) */


/* done - we return */ /* done - we return */
return JIM_OK; return JIM_OK;
} }
@@ -3839,6 +3841,13 @@ static int target_create( Jim_GetOptInfo *goi )
/* Do the rest as "configure" options */ /* Do the rest as "configure" options */
goi->isconfigure = 1; goi->isconfigure = 1;
e = target_configure( goi, target); e = target_configure( goi, target);

if (target->tap == NULL)
{
Jim_SetResultString( interp, "-chain-position required when creating target", -1);
e=JIM_ERR;
}

if( e != JIM_OK ){ if( e != JIM_OK ){
free( target->type ); free( target->type );
free( target ); free( target );


+ 29
- 0
src/target/test/syntax1.cfg View File

@@ -0,0 +1,29 @@
jtag_nsrst_delay 200
jtag_ntrst_delay 200
#use combined on interfaces or targets that can't set TRST/SRST separately
reset_config trst_and_srst srst_pulls_trst
#LPCs need reset pulled while RTCK is low. 0 to activate JTAG, power-on reset is not enough
jtag_reset 1 1
jtag_reset 0 0
#jtag scan chain
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
jtag newtap lpc2148 one -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x4f1f0f0f
#target configuration
#daemon_startup reset
set _TARGETNAME [format "%s.cpu" lpc2148]
target create lpc2148.cpu arm7tdmi -endian little -work-area-size 0x4000 -work-area-phys 0x40000000 -work-area-virt 0 -work-area-backup 0
$_TARGETNAME configure -event reset-init {
soft_reset_halt
mvb 0xE01FC040 0x01
}
flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 14765

Loading…
Cancel
Save