X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget%2Fwi-9c.cfg;h=3606d0d597f48705b9bbf3be2e805fbd84169df0;hp=58c8fabdb67c98431c2728f4b6ed2a0dc35dea7a;hb=a28eaa85f73759bb189a46308642502c9fa5aa4b;hpb=e4218ebb8f7f5bf27578198e16ae5add99edeb75

diff --git a/src/target/target/wi-9c.cfg b/src/target/target/wi-9c.cfg
index 58c8fabdb6..3606d0d597 100644
--- a/src/target/target/wi-9c.cfg
+++ b/src/target/target/wi-9c.cfg
@@ -1,21 +1,48 @@
+# FIXME: THIS IS A *BOARD* not a CHIP configuration.
 ######################################
 # Target: DIGI ConnectCore Wi-9C
 ######################################
 
 reset_config trst_and_srst
 
-#jtag_device <IR length> <IR capture> <IR mask> <IDCODE instruction>
-jtag_device 4 0x1 0xf 0xe
+if { [info exists CHIPNAME] } {	
+   set  _CHIPNAME $CHIPNAME    
+} else {	 
+   set  _CHIPNAME ns9360
+}
+
+if { [info exists ENDIAN] } {	
+   set  _ENDIAN $ENDIAN    
+} else {	 
+  # This config file was defaulting to big endian..
+   set  _ENDIAN big
+}
+
+
+# What's a good fallback frequency for this board if RCLK is
+# not available??
+jtag_rclk 1000
+
+
+if { [info exists CPUTAPID ] } {
+   set _CPUTAPID $CPUTAPID
+} else {
+   set _CPUTAPID 0xFFFFFFFF
+}
+
+set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+jtag newtap_device $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 jtag_nsrst_delay 200
 jtag_ntrst_delay 0
 
+
 ######################
 # Target configuration
 ######################
 
-target create target0 arm926ejs -endian big -chain-position 0 -variant arm926ejs
-[new_target_name] configure -event reset-init {
+target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
+$_TARGETNAME configure -event reset-init {
 	mww 0x90600104 0x33313333
 	mww 0xA0700000 0x00000001  # Enable the memory controller.
 	mww 0xA0700024 0x00000006  # Set the refresh counter 6
@@ -87,7 +114,7 @@ target create target0 arm926ejs -endian big -chain-position 0 -variant arm926ejs
 	reg cpsr 0xd3
 }
 
-[new_target_name] configure -work-area-virt 0 -work-area-phys 0x00000000 -work-area-size 0x1000 -work-area-backup 1
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x00000000 -work-area-size 0x1000 -work-area-backup 1
 
 #####################
 # Flash configuration