This is an automated email from Gerrit.

Paul Fertser ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/3932

-- gerrit

commit a35e56fcad8ecbdcfcf8b115e5fc40ce49cb080f
Author: Paul Fertser <[email protected]>
Date:   Sat Dec 31 16:05:55 2016 +0300

    tcl: interface: harmonise RPi configs
    
    Make all configs specify same JTAG and SWD GPIO numbers.
    
    Change-Id: I65b09c1671c97f253f0aab88e511de7409d91e0a
    Signed-off-by: Paul Fertser <[email protected]>

diff --git a/tcl/interface/raspberrypi-native.cfg 
b/tcl/interface/raspberrypi-native.cfg
index 6b73f35..c63dfdb 100644
--- a/tcl/interface/raspberrypi-native.cfg
+++ b/tcl/interface/raspberrypi-native.cfg
@@ -21,6 +21,10 @@ bcm2835gpio_speed_coeffs 113714 28
 # Header pin numbers: 23 22 19 21
 bcm2835gpio_jtag_nums 11 25 10 9
 
+# Each of the SWD lines need a gpio number set: swclk swdio
+# Header pin numbers: 23 22
+bcm2835gpio_swd_nums 11 25
+
 # If you define trst or srst, use appropriate reset_config
 # Header pin numbers: TRST - 26, SRST - 18
 
@@ -32,4 +36,3 @@ bcm2835gpio_jtag_nums 11 25 10 9
 
 # or if you have both connected,
 # reset_config trst_and_srst srst_push_pull
-
diff --git a/tcl/interface/raspberrypi2-native.cfg 
b/tcl/interface/raspberrypi2-native.cfg
index f846fa2..26a31c5 100644
--- a/tcl/interface/raspberrypi2-native.cfg
+++ b/tcl/interface/raspberrypi2-native.cfg
@@ -19,14 +19,11 @@ bcm2835gpio_speed_coeffs 146203 36
 
 # Each of the JTAG lines need a gpio number set: tck tms tdi tdo
 # Header pin numbers: 23 22 19 21
-# bcm2835gpio_jtag_nums 11 25 10 9
-
-# or if you have both connected,
-# reset_config trst_and_srst srst_push_pull
+bcm2835gpio_jtag_nums 11 25 10 9
 
 # Each of the SWD lines need a gpio number set: swclk swdio
-# Header pin numbers: 22 18
-bcm2835gpio_swd_nums 25 24
+# Header pin numbers: 23 22
+bcm2835gpio_swd_nums 11 25
 
 # If you define trst or srst, use appropriate reset_config
 # Header pin numbers: TRST - 26, SRST - 18
@@ -34,9 +31,8 @@ bcm2835gpio_swd_nums 25 24
 # bcm2835gpio_trst_num 7
 # reset_config trst_only
 
-bcm2835gpio_srst_num 18
-reset_config srst_only srst_push_pull
+# bcm2835gpio_srst_num 24
+# reset_config srst_only srst_push_pull
 
 # or if you have both connected,
 # reset_config trst_and_srst srst_push_pull
-
diff --git a/tcl/interface/sysfsgpio-raspberrypi.cfg 
b/tcl/interface/sysfsgpio-raspberrypi.cfg
index 3636422..9f5b87c 100644
--- a/tcl/interface/sysfsgpio-raspberrypi.cfg
+++ b/tcl/interface/sysfsgpio-raspberrypi.cfg
@@ -14,8 +14,18 @@ interface sysfsgpio
 # Header pin numbers: 23 22 19 21
 sysfsgpio_jtag_nums 11 25 10 9
 
-# At least one of srst or trst needs to be specified
+# Each of the SWD lines need a gpio number set: swclk swdio
+# Header pin numbers: 23 22
+sysfsgpio_swd_nums 11 25
+
+# If you define trst or srst, use appropriate reset_config
 # Header pin numbers: TRST - 26, SRST - 18
-sysfsgpio_trst_num 7
+
+# sysfsgpio_trst_num 7
+# reset_config trst_only
+
 # sysfsgpio_srst_num 24
+# reset_config srst_only srst_push_pull
 
+# or if you have both connected,
+# reset_config trst_and_srst srst_push_pull

-- 

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to