Try older OpenOCD

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4044 42af7a65-404d-4744-a932-0658087f49c3

60 files changed, 79 insertions, 10 deletions

diff --git a/nuttx/configs/ea3131/README.txt b/nuttx/configs/ea3131/README.txt
index 19f848c81..19f848c81 100755..100644
--- a/nuttx/configs/ea3131/README.txt
+++ b/nuttx/configs/ea3131/README.txt
diff --git a/nuttx/configs/ea3131/include/board.h b/nuttx/configs/ea3131/include/board.h
index 7e0a01b6a..7e0a01b6a 100755..100644
--- a/nuttx/configs/ea3131/include/board.h
+++ b/nuttx/configs/ea3131/include/board.h
diff --git a/nuttx/configs/ea3131/include/board_memorymap.h b/nuttx/configs/ea3131/include/board_memorymap.h
index 2604865c1..2604865c1 100755..100644
--- a/nuttx/configs/ea3131/include/board_memorymap.h
+++ b/nuttx/configs/ea3131/include/board_memorymap.h
diff --git a/nuttx/configs/ea3131/locked/Makefile b/nuttx/configs/ea3131/locked/Makefile
index 1108132ac..1108132ac 100755..100644
--- a/nuttx/configs/ea3131/locked/Makefile
+++ b/nuttx/configs/ea3131/locked/Makefile
diff --git a/nuttx/configs/ea3131/nsh/Make.defs b/nuttx/configs/ea3131/nsh/Make.defs
index 247cb6ebd..247cb6ebd 100755..100644
--- a/nuttx/configs/ea3131/nsh/Make.defs
+++ b/nuttx/configs/ea3131/nsh/Make.defs
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index 0c7193079..0c7193079 100755..100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
diff --git a/nuttx/configs/ea3131/nsh/ld.script b/nuttx/configs/ea3131/nsh/ld.script
index 8c3b2db45..8c3b2db45 100755..100644
--- a/nuttx/configs/ea3131/nsh/ld.script
+++ b/nuttx/configs/ea3131/nsh/ld.script
diff --git a/nuttx/configs/ea3131/ostest/Make.defs b/nuttx/configs/ea3131/ostest/Make.defs
index fd72ded9d..fd72ded9d 100755..100644
--- a/nuttx/configs/ea3131/ostest/Make.defs
+++ b/nuttx/configs/ea3131/ostest/Make.defs
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 0027aa242..0027aa242 100755..100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
diff --git a/nuttx/configs/ea3131/ostest/ld.script b/nuttx/configs/ea3131/ostest/ld.script
index 531e64ce9..531e64ce9 100755..100644
--- a/nuttx/configs/ea3131/ostest/ld.script
+++ b/nuttx/configs/ea3131/ostest/ld.script
diff --git a/nuttx/configs/ea3131/pgnsh/Make.defs b/nuttx/configs/ea3131/pgnsh/Make.defs
index 81edc73fa..81edc73fa 100755..100644
--- a/nuttx/configs/ea3131/pgnsh/Make.defs
+++ b/nuttx/configs/ea3131/pgnsh/Make.defs
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index 252a64c09..252a64c09 100755..100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
diff --git a/nuttx/configs/ea3131/pgnsh/ld.script b/nuttx/configs/ea3131/pgnsh/ld.script
index c4c597567..c4c597567 100755..100644
--- a/nuttx/configs/ea3131/pgnsh/ld.script
+++ b/nuttx/configs/ea3131/pgnsh/ld.script
diff --git a/nuttx/configs/ea3131/src/Makefile b/nuttx/configs/ea3131/src/Makefile
index b49619440..b49619440 100755..100644
--- a/nuttx/configs/ea3131/src/Makefile
+++ b/nuttx/configs/ea3131/src/Makefile
diff --git a/nuttx/configs/ea3131/src/ea3131_internal.h b/nuttx/configs/ea3131/src/ea3131_internal.h
index ca2a5b570..ca2a5b570 100755..100644
--- a/nuttx/configs/ea3131/src/ea3131_internal.h
+++ b/nuttx/configs/ea3131/src/ea3131_internal.h
diff --git a/nuttx/configs/ea3131/src/up_boot.c b/nuttx/configs/ea3131/src/up_boot.c
index 94c4d8a9c..94c4d8a9c 100755..100644
--- a/nuttx/configs/ea3131/src/up_boot.c
+++ b/nuttx/configs/ea3131/src/up_boot.c
diff --git a/nuttx/configs/ea3131/src/up_buttons.c b/nuttx/configs/ea3131/src/up_buttons.c
index f7c13b93a..f7c13b93a 100755..100644
--- a/nuttx/configs/ea3131/src/up_buttons.c
+++ b/nuttx/configs/ea3131/src/up_buttons.c
diff --git a/nuttx/configs/ea3131/src/up_clkinit.c b/nuttx/configs/ea3131/src/up_clkinit.c
index a0eba9c75..a0eba9c75 100755..100644
--- a/nuttx/configs/ea3131/src/up_clkinit.c
+++ b/nuttx/configs/ea3131/src/up_clkinit.c
diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c
index 531675aa0..531675aa0 100755..100644
--- a/nuttx/configs/ea3131/src/up_fillpage.c
+++ b/nuttx/configs/ea3131/src/up_fillpage.c
diff --git a/nuttx/configs/ea3131/src/up_leds.c b/nuttx/configs/ea3131/src/up_leds.c
index a0bec01b0..a0bec01b0 100755..100644
--- a/nuttx/configs/ea3131/src/up_leds.c
+++ b/nuttx/configs/ea3131/src/up_leds.c
diff --git a/nuttx/configs/ea3131/src/up_mem.c b/nuttx/configs/ea3131/src/up_mem.c
index 1559468ac..1559468ac 100755..100644
--- a/nuttx/configs/ea3131/src/up_mem.c
+++ b/nuttx/configs/ea3131/src/up_mem.c
diff --git a/nuttx/configs/ea3131/src/up_nsh.c b/nuttx/configs/ea3131/src/up_nsh.c
index c8dbf017b..c8dbf017b 100755..100644
--- a/nuttx/configs/ea3131/src/up_nsh.c
+++ b/nuttx/configs/ea3131/src/up_nsh.c
diff --git a/nuttx/configs/ea3131/src/up_spi.c b/nuttx/configs/ea3131/src/up_spi.c
index 7755e55b4..7755e55b4 100755..100644
--- a/nuttx/configs/ea3131/src/up_spi.c
+++ b/nuttx/configs/ea3131/src/up_spi.c
diff --git a/nuttx/configs/ea3131/src/up_usbstrg.c b/nuttx/configs/ea3131/src/up_usbstrg.c
index 5aef28733..5aef28733 100755..100644
--- a/nuttx/configs/ea3131/src/up_usbstrg.c
+++ b/nuttx/configs/ea3131/src/up_usbstrg.c
diff --git a/nuttx/configs/ea3131/tools/Makefile b/nuttx/configs/ea3131/tools/Makefile
index 6c3362d8c..6c3362d8c 100755..100644
--- a/nuttx/configs/ea3131/tools/Makefile
+++ b/nuttx/configs/ea3131/tools/Makefile
diff --git a/nuttx/configs/ea3131/tools/armusbocd.cfg b/nuttx/configs/ea3131/tools/armusbocd.cfg
index 733e3768c..733e3768c 100755..100644
--- a/nuttx/configs/ea3131/tools/armusbocd.cfg
+++ b/nuttx/configs/ea3131/tools/armusbocd.cfg
diff --git a/nuttx/configs/ea3131/tools/crc32.c b/nuttx/configs/ea3131/tools/crc32.c
index 6e98e4724..6e98e4724 100755..100644
--- a/nuttx/configs/ea3131/tools/crc32.c
+++ b/nuttx/configs/ea3131/tools/crc32.c
diff --git a/nuttx/configs/ea3131/tools/lpchdr.c b/nuttx/configs/ea3131/tools/lpchdr.c
index 9325c8813..9325c8813 100755..100644
--- a/nuttx/configs/ea3131/tools/lpchdr.c
+++ b/nuttx/configs/ea3131/tools/lpchdr.c
diff --git a/nuttx/configs/ea3131/tools/lpchdr.h b/nuttx/configs/ea3131/tools/lpchdr.h
index 46cc91076..46cc91076 100755..100644
--- a/nuttx/configs/ea3131/tools/lpchdr.h
+++ b/nuttx/configs/ea3131/tools/lpchdr.h
diff --git a/nuttx/configs/ea3131/usbserial/Make.defs b/nuttx/configs/ea3131/usbserial/Make.defs
index b1e236df8..b1e236df8 100755..100644
--- a/nuttx/configs/ea3131/usbserial/Make.defs
+++ b/nuttx/configs/ea3131/usbserial/Make.defs
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index d06212649..d06212649 100755..100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
diff --git a/nuttx/configs/ea3131/usbserial/ld.script b/nuttx/configs/ea3131/usbserial/ld.script
index 380051e28..380051e28 100755..100644
--- a/nuttx/configs/ea3131/usbserial/ld.script
+++ b/nuttx/configs/ea3131/usbserial/ld.script
diff --git a/nuttx/configs/ea3131/usbstorage/Make.defs b/nuttx/configs/ea3131/usbstorage/Make.defs
index 6838c9d69..6838c9d69 100755..100644
--- a/nuttx/configs/ea3131/usbstorage/Make.defs
+++ b/nuttx/configs/ea3131/usbstorage/Make.defs
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index 5dc459316..5dc459316 100755..100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbstorage/defconfig
diff --git a/nuttx/configs/ea3131/usbstorage/ld.script b/nuttx/configs/ea3131/usbstorage/ld.script
index 9828e5c97..9828e5c97 100755..100644
--- a/nuttx/configs/ea3131/usbstorage/ld.script
+++ b/nuttx/configs/ea3131/usbstorage/ld.script
diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt
index f0450751e..f0450751e 100755..100644
--- a/nuttx/configs/ea3152/README.txt
+++ b/nuttx/configs/ea3152/README.txt
diff --git a/nuttx/configs/ea3152/include/board.h b/nuttx/configs/ea3152/include/board.h
index 848c4137c..848c4137c 100755..100644
--- a/nuttx/configs/ea3152/include/board.h
+++ b/nuttx/configs/ea3152/include/board.h
diff --git a/nuttx/configs/ea3152/include/board_memorymap.h b/nuttx/configs/ea3152/include/board_memorymap.h
index c9242e6d2..c9242e6d2 100755..100644
--- a/nuttx/configs/ea3152/include/board_memorymap.h
+++ b/nuttx/configs/ea3152/include/board_memorymap.h
diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs
index 44d28fcac..44d28fcac 100755..100644
--- a/nuttx/configs/ea3152/ostest/Make.defs
+++ b/nuttx/configs/ea3152/ostest/Make.defs
diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index 36b716d2b..36b716d2b 100755..100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/configs/ea3152/ostest/defconfig
diff --git a/nuttx/configs/ea3152/ostest/ld.script b/nuttx/configs/ea3152/ostest/ld.script
index c52988ebc..c52988ebc 100755..100644
--- a/nuttx/configs/ea3152/ostest/ld.script
+++ b/nuttx/configs/ea3152/ostest/ld.script
diff --git a/nuttx/configs/ea3152/src/Makefile b/nuttx/configs/ea3152/src/Makefile
index 43b5edcc9..43b5edcc9 100755..100644
--- a/nuttx/configs/ea3152/src/Makefile
+++ b/nuttx/configs/ea3152/src/Makefile
diff --git a/nuttx/configs/ea3152/src/ea3152_internal.h b/nuttx/configs/ea3152/src/ea3152_internal.h
index 94a6e5a23..94a6e5a23 100755..100644
--- a/nuttx/configs/ea3152/src/ea3152_internal.h
+++ b/nuttx/configs/ea3152/src/ea3152_internal.h
diff --git a/nuttx/configs/ea3152/src/up_boot.c b/nuttx/configs/ea3152/src/up_boot.c
index e85cb5125..e85cb5125 100755..100644
--- a/nuttx/configs/ea3152/src/up_boot.c
+++ b/nuttx/configs/ea3152/src/up_boot.c
diff --git a/nuttx/configs/ea3152/src/up_buttons.c b/nuttx/configs/ea3152/src/up_buttons.c
index d56bfd766..d56bfd766 100755..100644
--- a/nuttx/configs/ea3152/src/up_buttons.c
+++ b/nuttx/configs/ea3152/src/up_buttons.c
diff --git a/nuttx/configs/ea3152/src/up_clkinit.c b/nuttx/configs/ea3152/src/up_clkinit.c
index 04dfe3411..04dfe3411 100755..100644
--- a/nuttx/configs/ea3152/src/up_clkinit.c
+++ b/nuttx/configs/ea3152/src/up_clkinit.c
diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c
index d1de9a699..d1de9a699 100755..100644
--- a/nuttx/configs/ea3152/src/up_fillpage.c
+++ b/nuttx/configs/ea3152/src/up_fillpage.c
diff --git a/nuttx/configs/ea3152/src/up_leds.c b/nuttx/configs/ea3152/src/up_leds.c
index 4c6aeea0f..4c6aeea0f 100755..100644
--- a/nuttx/configs/ea3152/src/up_leds.c
+++ b/nuttx/configs/ea3152/src/up_leds.c
diff --git a/nuttx/configs/ea3152/src/up_mem.c b/nuttx/configs/ea3152/src/up_mem.c
index 5eae04e0f..5eae04e0f 100755..100644
--- a/nuttx/configs/ea3152/src/up_mem.c
+++ b/nuttx/configs/ea3152/src/up_mem.c
diff --git a/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/up_nsh.c
index ab8f779f0..ab8f779f0 100755..100644
--- a/nuttx/configs/ea3152/src/up_nsh.c
+++ b/nuttx/configs/ea3152/src/up_nsh.c
diff --git a/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/up_spi.c
index 7f399d9dc..7f399d9dc 100755..100644
--- a/nuttx/configs/ea3152/src/up_spi.c
+++ b/nuttx/configs/ea3152/src/up_spi.c
diff --git a/nuttx/configs/ea3152/src/up_usbstrg.c b/nuttx/configs/ea3152/src/up_usbstrg.c
index 9f3a9bf3f..9f3a9bf3f 100755..100644
--- a/nuttx/configs/ea3152/src/up_usbstrg.c
+++ b/nuttx/configs/ea3152/src/up_usbstrg.c
diff --git a/nuttx/configs/ea3152/tools/Makefile b/nuttx/configs/ea3152/tools/Makefile
index 3da818658..3da818658 100755..100644
--- a/nuttx/configs/ea3152/tools/Makefile
+++ b/nuttx/configs/ea3152/tools/Makefile
diff --git a/nuttx/configs/ea3152/tools/armusbocd.cfg b/nuttx/configs/ea3152/tools/armusbocd.cfg
new file mode 100644
index 000000000..733e3768c
--- /dev/null
+++ b/nuttx/configs/ea3152/tools/armusbocd.cfg
@@ -0,0 +1,34 @@
+#daemon configuration
+telnet_port 4444
+gdb_port 3333
+
+#interface
+interface ft2232
+ft2232_device_desc "Olimex OpenOCD JTAG A"
+ft2232_layout "olimex-jtag"
+ft2232_vid_pid 0x15BA 0x0003
+jtag_speed 2
+
+#use combined on interfaces or targets that can't set TRST/SRST separately
+reset_config trst_and_srst separate
+
+#jtag scan chain
+#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
+jtag_device 4 0x1 0xf 0xe
+
+#target configuration
+daemon_startup reset
+
+#target <type> <startup mode>
+#target arm9ejs <reset mode> <chainpos> <endianness> <variant>
+target arm926ejs little run_and_halt 0 arm926ejs
+run_and_halt_time 0 30
+
+#target_script 0 reset oocd_flash2138.script
+working_area 0 0x1102800 0x60000 nobackup
+
+#flash configuration
+#flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v2 12000 calc_checksum
+
+# For more information about the configuration files, take a look at:
+# http://openfacts.berlios.de/index-en.phtml?title=Open+On-Chip+Debugger
diff --git a/nuttx/configs/ea3152/tools/crc32.c b/nuttx/configs/ea3152/tools/crc32.c
index 1b323fbcb..1b323fbcb 100755..100644
--- a/nuttx/configs/ea3152/tools/crc32.c
+++ b/nuttx/configs/ea3152/tools/crc32.c
diff --git a/nuttx/configs/ea3152/tools/lpc3152.cfg b/nuttx/configs/ea3152/tools/lpc3152.cfg
index 6a741b5dc..6a741b5dc 100755..100644
--- a/nuttx/configs/ea3152/tools/lpc3152.cfg
+++ b/nuttx/configs/ea3152/tools/lpc3152.cfg
diff --git a/nuttx/configs/ea3152/tools/lpchdr.c b/nuttx/configs/ea3152/tools/lpchdr.c
index 522ceeedd..522ceeedd 100755..100644
--- a/nuttx/configs/ea3152/tools/lpchdr.c
+++ b/nuttx/configs/ea3152/tools/lpchdr.c
diff --git a/nuttx/configs/ea3152/tools/lpchdr.h b/nuttx/configs/ea3152/tools/lpchdr.h
index 33aa4eae0..33aa4eae0 100755..100644
--- a/nuttx/configs/ea3152/tools/lpchdr.h
+++ b/nuttx/configs/ea3152/tools/lpchdr.h
diff --git a/nuttx/configs/ea3152/tools/olimex-arm-usb-ocd.cfg b/nuttx/configs/ea3152/tools/olimex-arm-usb-ocd.cfg
index 44263c2b2..44263c2b2 100755..100644
--- a/nuttx/configs/ea3152/tools/olimex-arm-usb-ocd.cfg
+++ b/nuttx/configs/ea3152/tools/olimex-arm-usb-ocd.cfg
diff --git a/nuttx/configs/ea3152/tools/oocd.sh b/nuttx/configs/ea3152/tools/oocd.sh
index 25a94e9bf..0bb495c18 100755
--- a/nuttx/configs/ea3152/tools/oocd.sh
+++ b/nuttx/configs/ea3152/tools/oocd.sh
@@ -8,6 +8,9 @@ if [ -z "${TOPDIR}" ]; then
 	exit 1
 fi
 
+###############################################################################
+# OpenOCD 0.4.0 ###############################################################
+###############################################################################
 # This script *probably* only works with the following version of OpenOCD:
 
 OPENOCD_PATH="/cygdrive/c/OpenOCD/openocd-0.4.0/src"
@@ -19,16 +22,10 @@ OPENOCD_SEARCHDIR="${TOPDIR}/configs/ea3152/tools"
 OPENOCD_WSEARCHDIR="`cygpath -w ${OPENOCD_SEARCHDIR}`"
 OPENOCD_INTERFACE="olimex-arm-usb-ocd.cfg"
 OPENOCD_TARGET="lpc3152.cfg"
-
 OPENOCD_ARGS="-s ${OPENOCD_WSEARCHDIR} -f ${OPENOCD_INTERFACE} -f ${OPENOCD_TARGET}"
 
 # Verify that everything is what it claims it is and is located where it claims it is.
 
-if [ "X$2" = "X-d" ]; then
-	OPENOCD_ARGS=$OPENOCD_ARGS" -d3"
-	set -x
-fi
-
 if [ ! -d "${OPENOCD_PATH}" ]; then
 	echo "OpenOCD path does not exist: ${OPENOCD_PATH}"
 	exit 1
@@ -45,6 +42,48 @@ if [ ! -f "${OPENOCD_SEARCHDIR}/${OPENOCD_INTERFACE}" ]; then
 	echo "OpenOCD interface config file does not exist: ${OPENOCD_SEARCHDIR}/${OPENOCD_INTERFACE}"
 	exit 1
 fi
+###############################################################################
+
+###############################################################################
+# Older OpenOCD that Shipped with the ARM-OCD JTAG ############################
+###############################################################################
+# This script *probably* only works with the following version of OpenOCD:
+#
+#OPENOCD_PATH="/cygdrive/c/gccfd/openocd/bin"
+#OPENOCD_EXE=openocd-ftd2xx.exe
+#
+# Local search directory and configurations
+#
+#OPENOCD_CFG="${TOPDIR}/configs/ea3152/tools/armusbocd.cfg"
+#OPENOCD_ARGS="-f `cygpath -w ${OPENOCD_CFG}`"
+#
+#if [ ! -f ${OPENOCD_CFG} ]; then
+#	echo "OpenOCD config file does not exist: ${OPENOCD_CFG}"
+#	exit 1
+#fi
+#
+# Verify that everything is what it claims it is and is located where it claims it is.
+#
+#if [ ! -d "${OPENOCD_PATH}" ]; then
+#	echo "OpenOCD path does not exist: ${OPENOCD_PATH}"
+#	exit 1
+#fi
+#if [ ! -x "${OPENOCD_PATH}/${OPENOCD_EXE}" ]; then
+#	echo "OpenOCD does not exist: ${OPENOCD_PATH}/${OPENOCD_EXE}"
+#	exit 1
+#fi
+#if [ ! -f ${OPENOCD_CFG} ]; then
+#	echo "OpenOCD config file does not exist: ${OPENOCD_CFG}"
+#	exit 1
+#fi
+###############################################################################
+
+# Enable debug if so requested
+
+if [ "X$2" = "X-d" ]; then
+	OPENOCD_ARGS=$OPENOCD_ARGS" -d3"
+	set -x
+fi
 
 # Okay... do it!
 
@@ -53,7 +92,3 @@ ${OPENOCD_PATH}/${OPENOCD_EXE} ${OPENOCD_ARGS} &
 echo "OpenOCD daemon started"
 ps -ef | grep openocd
 echo "In GDB: target remote localhost:3333"
-
-
-
-