summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-11-03 14:27:57 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-11-03 14:27:57 +0000
commitf809ee69357b1968443c58c7df91897249e0bc3f (patch)
tree15ebfcd86670386da2f2f606c599d63b6a030acb /src
parent8a7464df2d314e5a8ee07da4ae370a2327eaf024 (diff)
downloadopenocd+libswd-f809ee69357b1968443c58c7df91897249e0bc3f.tar.gz
openocd+libswd-f809ee69357b1968443c58c7df91897249e0bc3f.tar.bz2
openocd+libswd-f809ee69357b1968443c58c7df91897249e0bc3f.tar.xz
openocd+libswd-f809ee69357b1968443c58c7df91897249e0bc3f.zip
- fix issue with jlink/libusb timeout under linux
- add missing svn props git-svn-id: svn://svn.berlios.de/openocd/trunk@1128 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/jlink.c2
-rw-r--r--src/target/target/imx27.cfg24
2 files changed, 13 insertions, 13 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index c81e9a02..7f16f365 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -52,7 +52,7 @@
#define JLINK_WRITE_ENDPOINT 0x02
#define JLINK_READ_ENDPOINT 0x81
-#define JLINK_USB_TIMEOUT 100
+#define JLINK_USB_TIMEOUT 1000
#define JLINK_IN_BUFFER_SIZE 8192
#define JLINK_OUT_BUFFER_SIZE 8192
diff --git a/src/target/target/imx27.cfg b/src/target/target/imx27.cfg
index 6d3cd6be..c6fdf41c 100644
--- a/src/target/target/imx27.cfg
+++ b/src/target/target/imx27.cfg
@@ -1,12 +1,12 @@
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
-
-# There are 2 taps on the chip:
-# The ETM
-jtag_device 4 0x1 0xf 0xe
-# The ARM926EJS
-jtag_device 4 0x1 0xf 0xe
-
-# Note above there are 2 taps (#0 and #1) the ARM926 is the 2nd tap (ie #1)
-target create target0 arm926ejs -endianess little -chain-position 1 -variant arm926ejs
-
+#use combined on interfaces or targets that can't set TRST/SRST separately
+reset_config trst_and_srst
+
+# There are 2 taps on the chip:
+# The ETM
+jtag_device 4 0x1 0xf 0xe
+# The ARM926EJS
+jtag_device 4 0x1 0xf 0xe
+
+# Note above there are 2 taps (#0 and #1) the ARM926 is the 2nd tap (ie #1)
+target create target0 arm926ejs -endianess little -chain-position 1 -variant arm926ejs
+