- 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

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index c81e9a0291a9a61d7ce4d0aba639d906181b97a1..7f16f365e0c8b25256d22f394f2ab8addd537fd6 100644 (file)
--- 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 6d3cd6be2401e4be87a61dc8f13a753d8bf9d20f..c6fdf41c3476998b622ddf2e6d75441b8d86709a 100644 (file)
--- 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\r
-reset_config trst_and_srst\r
-\r
-# There are 2 taps on the chip:\r
-# The ETM\r
-jtag_device 4 0x1 0xf 0xe\r
-# The ARM926EJS\r
-jtag_device 4 0x1 0xf 0xe\r
-\r
-# Note above there are 2 taps (#0 and #1) the ARM926 is the 2nd tap (ie #1)\r
-target create target0 arm926ejs -endianess little -chain-position 1 -variant arm926ejs\r
-\r
+#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
+