Menu
▾
▴
openocd-commit — OpenOCD commit maling list - read only
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(75) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(70) |
Feb
(20) |
Mar
(52) |
Apr
(149) |
May
(387) |
Jun
(466) |
Jul
(133) |
Aug
(87) |
Sep
(122) |
Oct
(140) |
Nov
(185) |
Dec
(105) |
| 2010 |
Jan
(85) |
Feb
(45) |
Mar
(75) |
Apr
(17) |
May
(41) |
Jun
(52) |
Jul
(33) |
Aug
(29) |
Sep
(36) |
Oct
(15) |
Nov
(26) |
Dec
(34) |
| 2011 |
Jan
(26) |
Feb
(25) |
Mar
(26) |
Apr
(29) |
May
(20) |
Jun
(27) |
Jul
(15) |
Aug
(32) |
Sep
(13) |
Oct
(64) |
Nov
(60) |
Dec
(10) |
| 2012 |
Jan
(64) |
Feb
(63) |
Mar
(39) |
Apr
(43) |
May
(54) |
Jun
(11) |
Jul
(30) |
Aug
(45) |
Sep
(11) |
Oct
(70) |
Nov
(24) |
Dec
(23) |
| 2013 |
Jan
(17) |
Feb
(8) |
Mar
(35) |
Apr
(40) |
May
(20) |
Jun
(24) |
Jul
(36) |
Aug
(25) |
Sep
(42) |
Oct
(40) |
Nov
(9) |
Dec
(21) |
| 2014 |
Jan
(29) |
Feb
(24) |
Mar
(60) |
Apr
(22) |
May
(22) |
Jun
(46) |
Jul
(11) |
Aug
(23) |
Sep
(26) |
Oct
(10) |
Nov
(14) |
Dec
(2) |
| 2015 |
Jan
(28) |
Feb
(47) |
Mar
(33) |
Apr
(58) |
May
(5) |
Jun
(1) |
Jul
|
Aug
(8) |
Sep
(12) |
Oct
(25) |
Nov
(58) |
Dec
(21) |
| 2016 |
Jan
(12) |
Feb
(40) |
Mar
(2) |
Apr
(1) |
May
(67) |
Jun
(2) |
Jul
(5) |
Aug
(36) |
Sep
|
Oct
(24) |
Nov
(17) |
Dec
(50) |
| 2017 |
Jan
(14) |
Feb
(16) |
Mar
(2) |
Apr
(35) |
May
(14) |
Jun
(16) |
Jul
(3) |
Aug
(3) |
Sep
|
Oct
(19) |
Nov
|
Dec
(16) |
| 2018 |
Jan
(55) |
Feb
(11) |
Mar
(34) |
Apr
(14) |
May
(4) |
Jun
(20) |
Jul
(39) |
Aug
(16) |
Sep
(17) |
Oct
(16) |
Nov
(20) |
Dec
(30) |
| 2019 |
Jan
(29) |
Feb
(24) |
Mar
(37) |
Apr
(26) |
May
(19) |
Jun
(21) |
Jul
(2) |
Aug
(3) |
Sep
(9) |
Oct
(12) |
Nov
(12) |
Dec
(12) |
| 2020 |
Jan
(47) |
Feb
(36) |
Mar
(54) |
Apr
(44) |
May
(37) |
Jun
(19) |
Jul
(32) |
Aug
(13) |
Sep
(16) |
Oct
(24) |
Nov
(32) |
Dec
(11) |
| 2021 |
Jan
(14) |
Feb
(5) |
Mar
(40) |
Apr
(32) |
May
(42) |
Jun
(31) |
Jul
(29) |
Aug
(47) |
Sep
(38) |
Oct
(17) |
Nov
(74) |
Dec
(33) |
| 2022 |
Jan
(11) |
Feb
(15) |
Mar
(40) |
Apr
(21) |
May
(39) |
Jun
(44) |
Jul
(19) |
Aug
(46) |
Sep
(79) |
Oct
(35) |
Nov
(21) |
Dec
(15) |
| 2023 |
Jan
(56) |
Feb
(13) |
Mar
(43) |
Apr
(28) |
May
(60) |
Jun
(15) |
Jul
(29) |
Aug
(28) |
Sep
(32) |
Oct
(21) |
Nov
(42) |
Dec
(39) |
| 2024 |
Jan
(35) |
Feb
(17) |
Mar
(28) |
Apr
(7) |
May
(14) |
Jun
(35) |
Jul
(30) |
Aug
(35) |
Sep
(30) |
Oct
(28) |
Nov
(38) |
Dec
(18) |
| 2025 |
Jan
(21) |
Feb
(28) |
Mar
(36) |
Apr
(35) |
May
(34) |
Jun
(58) |
Jul
(9) |
Aug
(37) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:32:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 3bfe4926632d458da449f0438db6949c75b7af59 (commit)
via 6bac2828b287e1d8d41f0239ffb21f5855b96896 (commit)
via 74634d177b6c9853d6d38144c8783ff10c1b2e9b (commit)
from 9d5767b6b005e426f77460c42bafce157de74a25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3bfe4926632d458da449f0438db6949c75b7af59
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 12 12:52:59 2019 +0200
coding style: doc: remove empty lines at end of text files
Empty lines at end of text files are useless.
Remove them.
Change-Id: I30e4d3d03c4ce846aa7bcefa7366f88732275557
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5170
Tested-by: jenkins
diff --git a/NEWS-0.5.0 b/NEWS-0.5.0
index add6c1e90..90ea35c41 100644
--- a/NEWS-0.5.0
+++ b/NEWS-0.5.0
@@ -71,4 +71,3 @@ For older NEWS, see the NEWS files associated with each release
For more information about contributing test reports, bug fixes, or new
features and device support, please read the new Developer Manual (or
the BUGS and PATCHES.txt files in the source archive).
-
diff --git a/TODO b/TODO
index a4102eb3b..c73d772e2 100644
--- a/TODO
+++ b/TODO
@@ -392,4 +392,3 @@ to complete:
/** @file
This file contains the @ref thelist page.
*/
-
diff --git a/doc/fdl.texi b/doc/fdl.texi
index a18c33ea0..33b2a1646 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -449,4 +449,3 @@ to permit their use in free software.
@c Local Variables:
@c ispell-local-pdict: "ispell-dict"
@c End:
-
commit 6bac2828b287e1d8d41f0239ffb21f5855b96896
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 12 12:51:28 2019 +0200
coding style: testing: remove empty lines at end of text files
Empty lines at end of text files are useless.
Remove them.
Change-Id: Id05a7bd944edccaa03ed9eb48599b2e262664cf0
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5169
Tested-by: jenkins
diff --git a/testing/build.test1/Makefile b/testing/build.test1/Makefile
index 7271bf2c6..02b752307 100644
--- a/testing/build.test1/Makefile
+++ b/testing/build.test1/Makefile
@@ -93,6 +93,3 @@ all.download:
linux.ftd2xx_installed \
linux.ft22232_libftdi \
linux.ftd2xx_installed.setup
-
-
-
diff --git a/testing/build.test1/README.TXT b/testing/build.test1/README.TXT
index c8244382a..7f4d401e8 100644
--- a/testing/build.test1/README.TXT
+++ b/testing/build.test1/README.TXT
@@ -36,4 +36,3 @@ Dec 26,2008
cd ~/work
make cygwin.buildtest
-
diff --git a/testing/build.test1/mingw32_help/include/sys/cdefs.h b/testing/build.test1/mingw32_help/include/sys/cdefs.h
index c401ce794..606205a58 100644
--- a/testing/build.test1/mingw32_help/include/sys/cdefs.h
+++ b/testing/build.test1/mingw32_help/include/sys/cdefs.h
@@ -20,4 +20,3 @@ details. */
#define __P(protos) protos /* full-blown ANSI C */
#define __CONCAT(__x,__y) __x##__y
#endif
-
diff --git a/testing/build.test2/README.txt b/testing/build.test2/README.txt
index d71c14b5a..382105ef0 100644
--- a/testing/build.test2/README.txt
+++ b/testing/build.test2/README.txt
@@ -56,4 +56,3 @@ For example - in cygwin, type this:
=======
**END**
=======
-
diff --git a/testing/examples/AT91R40008Test/prj/ethernut3_ram.ld b/testing/examples/AT91R40008Test/prj/ethernut3_ram.ld
index 604e70412..a5ae16eb8 100644
--- a/testing/examples/AT91R40008Test/prj/ethernut3_ram.ld
+++ b/testing/examples/AT91R40008Test/prj/ethernut3_ram.ld
@@ -137,4 +137,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/AT91R40008Test/src/crt.s b/testing/examples/AT91R40008Test/src/crt.s
index 0b7026118..bab4609a2 100644
--- a/testing/examples/AT91R40008Test/src/crt.s
+++ b/testing/examples/AT91R40008Test/src/crt.s
@@ -167,6 +167,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/LPC2148Test/prj/lpc2148_ram.ld b/testing/examples/LPC2148Test/prj/lpc2148_ram.ld
index b7951342d..3cbb616f3 100644
--- a/testing/examples/LPC2148Test/prj/lpc2148_ram.ld
+++ b/testing/examples/LPC2148Test/prj/lpc2148_ram.ld
@@ -137,4 +137,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/LPC2148Test/prj/lpc2148_rom.ld b/testing/examples/LPC2148Test/prj/lpc2148_rom.ld
index 5844fffce..9cb12e4f6 100644
--- a/testing/examples/LPC2148Test/prj/lpc2148_rom.ld
+++ b/testing/examples/LPC2148Test/prj/lpc2148_rom.ld
@@ -138,4 +138,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/LPC2148Test/src/crt.s b/testing/examples/LPC2148Test/src/crt.s
index 774f6b4ae..6fd1d3059 100644
--- a/testing/examples/LPC2148Test/src/crt.s
+++ b/testing/examples/LPC2148Test/src/crt.s
@@ -184,6 +184,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/LPC2294Test/prj/lpc2294_ram.ld b/testing/examples/LPC2294Test/prj/lpc2294_ram.ld
index 17eaedd87..bc4b93947 100644
--- a/testing/examples/LPC2294Test/prj/lpc2294_ram.ld
+++ b/testing/examples/LPC2294Test/prj/lpc2294_ram.ld
@@ -137,4 +137,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/LPC2294Test/prj/lpc2294_rom.ld b/testing/examples/LPC2294Test/prj/lpc2294_rom.ld
index 64a28f0c6..ca71c28c1 100644
--- a/testing/examples/LPC2294Test/prj/lpc2294_rom.ld
+++ b/testing/examples/LPC2294Test/prj/lpc2294_rom.ld
@@ -138,4 +138,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/LPC2294Test/src/crt.s b/testing/examples/LPC2294Test/src/crt.s
index ac17dcd5f..8b24cc195 100644
--- a/testing/examples/LPC2294Test/src/crt.s
+++ b/testing/examples/LPC2294Test/src/crt.s
@@ -184,6 +184,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/SAM7S256Test/prj/sam7s256_ram.ld b/testing/examples/SAM7S256Test/prj/sam7s256_ram.ld
index 1b857c99f..593e17cac 100644
--- a/testing/examples/SAM7S256Test/prj/sam7s256_ram.ld
+++ b/testing/examples/SAM7S256Test/prj/sam7s256_ram.ld
@@ -129,4 +129,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/SAM7S256Test/prj/sam7s256_rom.ld b/testing/examples/SAM7S256Test/prj/sam7s256_rom.ld
index b64854acd..b181023bb 100644
--- a/testing/examples/SAM7S256Test/prj/sam7s256_rom.ld
+++ b/testing/examples/SAM7S256Test/prj/sam7s256_rom.ld
@@ -130,4 +130,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/SAM7S256Test/src/crt.s b/testing/examples/SAM7S256Test/src/crt.s
index 16e5865ea..b0bae0d63 100644
--- a/testing/examples/SAM7S256Test/src/crt.s
+++ b/testing/examples/SAM7S256Test/src/crt.s
@@ -220,6 +220,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/SAM7X256Test/prj/sam7x256_ram.ld b/testing/examples/SAM7X256Test/prj/sam7x256_ram.ld
index 1b857c99f..593e17cac 100644
--- a/testing/examples/SAM7X256Test/prj/sam7x256_ram.ld
+++ b/testing/examples/SAM7X256Test/prj/sam7x256_ram.ld
@@ -129,4 +129,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/SAM7X256Test/prj/sam7x256_rom.ld b/testing/examples/SAM7X256Test/prj/sam7x256_rom.ld
index b64854acd..b181023bb 100644
--- a/testing/examples/SAM7X256Test/prj/sam7x256_rom.ld
+++ b/testing/examples/SAM7X256Test/prj/sam7x256_rom.ld
@@ -130,4 +130,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/SAM7X256Test/src/crt.s b/testing/examples/SAM7X256Test/src/crt.s
index 16e5865ea..b0bae0d63 100644
--- a/testing/examples/SAM7X256Test/src/crt.s
+++ b/testing/examples/SAM7X256Test/src/crt.s
@@ -220,6 +220,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/STR710JtagSpeed/prj/eclipse_ft2232_ram.gdb b/testing/examples/STR710JtagSpeed/prj/eclipse_ft2232_ram.gdb
index 92f8e18e5..9c48e3571 100644
--- a/testing/examples/STR710JtagSpeed/prj/eclipse_ft2232_ram.gdb
+++ b/testing/examples/STR710JtagSpeed/prj/eclipse_ft2232_ram.gdb
@@ -24,10 +24,3 @@ monitor verify_ircapture disable
load
break main
continue
-
-
-
-
-
-
-
diff --git a/testing/examples/STR710JtagSpeed/prj/str7_ram.ld b/testing/examples/STR710JtagSpeed/prj/str7_ram.ld
index d760f2620..ded9ab4b4 100644
--- a/testing/examples/STR710JtagSpeed/prj/str7_ram.ld
+++ b/testing/examples/STR710JtagSpeed/prj/str7_ram.ld
@@ -137,4 +137,3 @@ SECTIONS
}
/*** EOF ***/
-
diff --git a/testing/examples/STR710JtagSpeed/src/crt.s b/testing/examples/STR710JtagSpeed/src/crt.s
index d1c238c7b..c27d18e02 100644
--- a/testing/examples/STR710JtagSpeed/src/crt.s
+++ b/testing/examples/STR710JtagSpeed/src/crt.s
@@ -258,6 +258,4 @@ FIQHandler:
.weak IRQHandler, FIQHandler
.ltorg
-/*** EOF ***/
-
-
+/*** EOF ***/
diff --git a/testing/examples/STR710Test/prj/hitex_str7_rom.ld b/testing/examples/STR710Test/prj/hitex_str7_rom.ld
index 11ac4b621..329dbe014 100644
--- a/testing/examples/STR710Test/prj/hitex_str7_rom.ld
+++ b/testing/examples/STR710Test/prj/hitex_str7_rom.ld
@@ -256,4 +256,3 @@ SECTIONS
.debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) }
}
-
diff --git a/testing/examples/STR710Test/prj/str710_program.script b/testing/examples/STR710Test/prj/str710_program.script
index b268adf09..b1601b847 100644
--- a/testing/examples/STR710Test/prj/str710_program.script
+++ b/testing/examples/STR710Test/prj/str710_program.script
@@ -1,8 +1 @@
flash protect 0 0 7 off
-
-
-
-
-
-
-
diff --git a/testing/examples/STR710Test/src/crt.s b/testing/examples/STR710Test/src/crt.s
index c9db5f5ea..0e7cd37d8 100644
--- a/testing/examples/STR710Test/src/crt.s
+++ b/testing/examples/STR710Test/src/crt.s
@@ -296,4 +296,3 @@ FIQHandler:
.ltorg
/*** EOF ***/
-
diff --git a/testing/examples/STR912Test/prj/eclipse_ram.gdb b/testing/examples/STR912Test/prj/eclipse_ram.gdb
index 00a62d705..67def3c4f 100644
--- a/testing/examples/STR912Test/prj/eclipse_ram.gdb
+++ b/testing/examples/STR912Test/prj/eclipse_ram.gdb
@@ -15,7 +15,3 @@ monitor mww 0x54000000 0xf
load
break main
continue
-
-
-
-
diff --git a/testing/examples/STR912Test/prj/eclipse_rom.gdb b/testing/examples/STR912Test/prj/eclipse_rom.gdb
index 58977cfcd..35cbff8e1 100644
--- a/testing/examples/STR912Test/prj/eclipse_rom.gdb
+++ b/testing/examples/STR912Test/prj/eclipse_rom.gdb
@@ -15,7 +15,3 @@ monitor mww 0x54000000 0xf
load
break main
continue
-
-
-
-
diff --git a/testing/examples/STR912Test/prj/str912_program.script b/testing/examples/STR912Test/prj/str912_program.script
index df0239b9d..45ec8a7a2 100644
--- a/testing/examples/STR912Test/prj/str912_program.script
+++ b/testing/examples/STR912Test/prj/str912_program.script
@@ -1,9 +1,2 @@
str9x flash_config 0 4 2 0 0x80000
flash protect 0 0 7 off
-
-
-
-
-
-
-
diff --git a/testing/examples/STR912Test/prj/str912_ram.ld b/testing/examples/STR912Test/prj/str912_ram.ld
index 269ada9bf..9b9e731d4 100644
--- a/testing/examples/STR912Test/prj/str912_ram.ld
+++ b/testing/examples/STR912Test/prj/str912_ram.ld
@@ -215,4 +215,3 @@ SECTIONS
.debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) }
}
-
diff --git a/testing/examples/STR912Test/prj/str912_rom.ld b/testing/examples/STR912Test/prj/str912_rom.ld
index 804149d21..aace268ca 100644
--- a/testing/examples/STR912Test/prj/str912_rom.ld
+++ b/testing/examples/STR912Test/prj/str912_rom.ld
@@ -246,4 +246,3 @@ SECTIONS
.debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) }
}
-
diff --git a/testing/examples/ledtest-imx27ads/Makefile b/testing/examples/ledtest-imx27ads/Makefile
index 4009c41b2..a1e0ba3ac 100644
--- a/testing/examples/ledtest-imx27ads/Makefile
+++ b/testing/examples/ledtest-imx27ads/Makefile
@@ -39,4 +39,3 @@ dump_full:
clean:
-/bin/rm -f *.o *~ test.elf
-
diff --git a/testing/examples/ledtest-imx27ads/crt0.S b/testing/examples/ledtest-imx27ads/crt0.S
index d7498814c..770982b31 100644
--- a/testing/examples/ledtest-imx27ads/crt0.S
+++ b/testing/examples/ledtest-imx27ads/crt0.S
@@ -44,4 +44,3 @@ _mainCRTStartup:
.word __bss_start__
.LC2:
.word __bss_end__
-
diff --git a/testing/examples/ledtest-imx27ads/gdbinit-imx27ads b/testing/examples/ledtest-imx27ads/gdbinit-imx27ads
index 4764bc738..88fc78a3d 100644
--- a/testing/examples/ledtest-imx27ads/gdbinit-imx27ads
+++ b/testing/examples/ledtest-imx27ads/gdbinit-imx27ads
@@ -33,4 +33,3 @@ b main
# Run to the breakpoint.
c
-
diff --git a/testing/examples/ledtest-imx27ads/test.c b/testing/examples/ledtest-imx27ads/test.c
index a3dd52234..01dc284da 100644
--- a/testing/examples/ledtest-imx27ads/test.c
+++ b/testing/examples/ledtest-imx27ads/test.c
@@ -54,5 +54,3 @@ atexit()
{
while (1);
} /* ATEXIT */
-
-
diff --git a/testing/examples/ledtest-imx31pdk/Makefile b/testing/examples/ledtest-imx31pdk/Makefile
index 74e2fc23f..1ca6a8d15 100644
--- a/testing/examples/ledtest-imx31pdk/Makefile
+++ b/testing/examples/ledtest-imx31pdk/Makefile
@@ -39,4 +39,3 @@ dump_full:
clean:
-/bin/rm -f *.o *~ test.elf
-
diff --git a/testing/examples/ledtest-imx31pdk/crt0.S b/testing/examples/ledtest-imx31pdk/crt0.S
index d7498814c..770982b31 100644
--- a/testing/examples/ledtest-imx31pdk/crt0.S
+++ b/testing/examples/ledtest-imx31pdk/crt0.S
@@ -44,4 +44,3 @@ _mainCRTStartup:
.word __bss_start__
.LC2:
.word __bss_end__
-
diff --git a/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk b/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk
index 304a8d899..8374f5acb 100644
--- a/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk
+++ b/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk
@@ -33,4 +33,3 @@ b main
# Run to the breakpoint.
c
-
diff --git a/testing/examples/ledtest-imx31pdk/test.c b/testing/examples/ledtest-imx31pdk/test.c
index 4135f89c0..a7e37b442 100644
--- a/testing/examples/ledtest-imx31pdk/test.c
+++ b/testing/examples/ledtest-imx31pdk/test.c
@@ -52,5 +52,3 @@ atexit()
{
while (1);
} /* ATEXIT */
-
-
diff --git a/testing/profile_stm32.txt b/testing/profile_stm32.txt
index a7e03b08f..e0eb875ad 100644
--- a/testing/profile_stm32.txt
+++ b/testing/profile_stm32.txt
@@ -49,4 +49,3 @@ step 114
mem 96
erase 1547
flash fill 15564
-
diff --git a/testing/tcl_test.tcl b/testing/tcl_test.tcl
index 476e1c21a..3883dd965 100644
--- a/testing/tcl_test.tcl
+++ b/testing/tcl_test.tcl
@@ -60,6 +60,3 @@ puts "Running help on PC using data from OpenOCD"
global ocd_helptext
set ocd_helptext [get_help_text]
puts [pc_help]
-
-
-
commit 74634d177b6c9853d6d38144c8783ff10c1b2e9b
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 12 12:38:18 2019 +0200
coding style: tools: remove empty lines at end of text files
Empty lines at end of text files are useless.
Remove them.
Change-Id: Iea4c8425e137d6252fb2e5b62e0b124c73a01cb6
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5168
Tested-by: jenkins
diff --git a/tools/release/helpers.sh b/tools/release/helpers.sh
index 47d5782ab..f06df34e9 100644
--- a/tools/release/helpers.sh
+++ b/tools/release/helpers.sh
@@ -57,4 +57,3 @@ Release: ${PACKAGE_RELEASE}
Type: ${RELEASE_TYPE}
INFO
}
-
diff --git a/tools/release/version.sh b/tools/release/version.sh
index d6c9434b3..a1c92f708 100755
--- a/tools/release/version.sh
+++ b/tools/release/version.sh
@@ -146,4 +146,3 @@ do_version() {
package_info_load
do_version "$@"
-
diff --git a/tools/st7_dtc_as/st7_dtc_as.pl b/tools/st7_dtc_as/st7_dtc_as.pl
index 380c61d80..d4c42d7af 100755
--- a/tools/st7_dtc_as/st7_dtc_as.pl
+++ b/tools/st7_dtc_as/st7_dtc_as.pl
@@ -706,4 +706,3 @@ if($opt{'b'}) {
0;
-
-----------------------------------------------------------------------
Summary of changes:
NEWS-0.5.0 | 1 -
TODO | 1 -
doc/fdl.texi | 1 -
testing/build.test1/Makefile | 3 ---
testing/build.test1/README.TXT | 1 -
testing/build.test1/mingw32_help/include/sys/cdefs.h | 1 -
testing/build.test2/README.txt | 1 -
testing/examples/AT91R40008Test/prj/ethernut3_ram.ld | 1 -
testing/examples/AT91R40008Test/src/crt.s | 4 +---
testing/examples/LPC2148Test/prj/lpc2148_ram.ld | 1 -
testing/examples/LPC2148Test/prj/lpc2148_rom.ld | 1 -
testing/examples/LPC2148Test/src/crt.s | 4 +---
testing/examples/LPC2294Test/prj/lpc2294_ram.ld | 1 -
testing/examples/LPC2294Test/prj/lpc2294_rom.ld | 1 -
testing/examples/LPC2294Test/src/crt.s | 4 +---
testing/examples/SAM7S256Test/prj/sam7s256_ram.ld | 1 -
testing/examples/SAM7S256Test/prj/sam7s256_rom.ld | 1 -
testing/examples/SAM7S256Test/src/crt.s | 4 +---
testing/examples/SAM7X256Test/prj/sam7x256_ram.ld | 1 -
testing/examples/SAM7X256Test/prj/sam7x256_rom.ld | 1 -
testing/examples/SAM7X256Test/src/crt.s | 4 +---
testing/examples/STR710JtagSpeed/prj/eclipse_ft2232_ram.gdb | 7 -------
testing/examples/STR710JtagSpeed/prj/str7_ram.ld | 1 -
testing/examples/STR710JtagSpeed/src/crt.s | 4 +---
testing/examples/STR710Test/prj/hitex_str7_rom.ld | 1 -
testing/examples/STR710Test/prj/str710_program.script | 7 -------
testing/examples/STR710Test/src/crt.s | 1 -
testing/examples/STR912Test/prj/eclipse_ram.gdb | 4 ----
testing/examples/STR912Test/prj/eclipse_rom.gdb | 4 ----
testing/examples/STR912Test/prj/str912_program.script | 7 -------
testing/examples/STR912Test/prj/str912_ram.ld | 1 -
testing/examples/STR912Test/prj/str912_rom.ld | 1 -
testing/examples/ledtest-imx27ads/Makefile | 1 -
testing/examples/ledtest-imx27ads/crt0.S | 1 -
testing/examples/ledtest-imx27ads/gdbinit-imx27ads | 1 -
testing/examples/ledtest-imx27ads/test.c | 2 --
testing/examples/ledtest-imx31pdk/Makefile | 1 -
testing/examples/ledtest-imx31pdk/crt0.S | 1 -
testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk | 1 -
testing/examples/ledtest-imx31pdk/test.c | 2 --
testing/profile_stm32.txt | 1 -
testing/tcl_test.tcl | 3 ---
tools/release/helpers.sh | 1 -
tools/release/version.sh | 1 -
tools/st7_dtc_as/st7_dtc_as.pl | 1 -
45 files changed, 6 insertions(+), 87 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:31:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 9d5767b6b005e426f77460c42bafce157de74a25 (commit)
via e7306d361b5d503cf27dfb3dc69298ddad495f88 (commit)
from 86d8c05eb68866297cbc1ec5f90d3d1634c69a1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9d5767b6b005e426f77460c42bafce157de74a25
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 12 12:26:46 2019 +0200
coding style: add newline at end of text files
Some text file is missing newline at EOF.
Add it.
Change-Id: Ieebc790096f40961283c644642e56fde975e957f
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5167
Tested-by: jenkins
diff --git a/contrib/loaders/flash/at91sam7x/makefile b/contrib/loaders/flash/at91sam7x/makefile
index c3eaf126b..39482976e 100644
--- a/contrib/loaders/flash/at91sam7x/makefile
+++ b/contrib/loaders/flash/at91sam7x/makefile
@@ -127,4 +127,4 @@ clean:
#
#-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/tcl/board/hilscher_nxhx10.cfg b/tcl/board/hilscher_nxhx10.cfg
index 7ff99165a..add424d4e 100644
--- a/tcl/board/hilscher_nxhx10.cfg
+++ b/tcl/board/hilscher_nxhx10.cfg
@@ -79,4 +79,4 @@ $_TARGETNAME configure -event reset-init {
#flash bank parflash cfi 0xC0000000 0x01000000 2 2 $_TARGETNAME
init
-reset init
\ No newline at end of file
+reset init
diff --git a/tcl/board/iar_str912_sk.cfg b/tcl/board/iar_str912_sk.cfg
index ba060a046..54f517b73 100644
--- a/tcl/board/iar_str912_sk.cfg
+++ b/tcl/board/iar_str912_sk.cfg
@@ -1,3 +1,3 @@
# The IAR str912-sk evaluation kick start board has an str912
-source [find target/str912.cfg]
\ No newline at end of file
+source [find target/str912.cfg]
diff --git a/tcl/board/twr-vf65gs10_cmsisdap.cfg b/tcl/board/twr-vf65gs10_cmsisdap.cfg
index e8db75491..ab4548f99 100644
--- a/tcl/board/twr-vf65gs10_cmsisdap.cfg
+++ b/tcl/board/twr-vf65gs10_cmsisdap.cfg
@@ -12,4 +12,4 @@ transport select swd
source [find board/twr-vf65gs10.cfg]
# override reset configuration
-reset_config srst_only
\ No newline at end of file
+reset_config srst_only
diff --git a/tcl/interface/imx-native.cfg b/tcl/interface/imx-native.cfg
index d9bc7eb04..9e1f38d03 100644
--- a/tcl/interface/imx-native.cfg
+++ b/tcl/interface/imx-native.cfg
@@ -32,4 +32,4 @@ imx_gpio_swd_nums 1 6
# reset_config srst_only srst_push_pull
# or if you have both connected,
-# reset_config trst_and_srst srst_push_pull
\ No newline at end of file
+# reset_config trst_and_srst srst_push_pull
diff --git a/tcl/interface/openjtag.cfg b/tcl/interface/openjtag.cfg
index 7bd532545..9a5827b14 100644
--- a/tcl/interface/openjtag.cfg
+++ b/tcl/interface/openjtag.cfg
@@ -5,4 +5,4 @@
#
adapter driver openjtag
-openjtag_device_desc "Open JTAG Project"
\ No newline at end of file
+openjtag_device_desc "Open JTAG Project"
diff --git a/tcl/target/c100config.tcl b/tcl/target/c100config.tcl
index 52efa83c2..a72a2fa84 100644
--- a/tcl/target/c100config.tcl
+++ b/tcl/target/c100config.tcl
@@ -409,4 +409,4 @@ proc flashUBOOT {file} {
putsUART0 "done.\n"
putsUART0 "Rebooting, please wait!\n"
reboot
-}
\ No newline at end of file
+}
diff --git a/testing/examples/AT91R40008Test/makefile b/testing/examples/AT91R40008Test/makefile
index c57130a7b..24898a329 100644
--- a/testing/examples/AT91R40008Test/makefile
+++ b/testing/examples/AT91R40008Test/makefile
@@ -134,4 +134,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/LPC2148Test/makefile b/testing/examples/LPC2148Test/makefile
index 3a098c33b..53f45f668 100644
--- a/testing/examples/LPC2148Test/makefile
+++ b/testing/examples/LPC2148Test/makefile
@@ -144,4 +144,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/LPC2148Test/prj/eclipse_ram.gdb b/testing/examples/LPC2148Test/prj/eclipse_ram.gdb
index 4f423124d..ea0e21fc3 100644
--- a/testing/examples/LPC2148Test/prj/eclipse_ram.gdb
+++ b/testing/examples/LPC2148Test/prj/eclipse_ram.gdb
@@ -8,4 +8,4 @@ monitor mww 0xE01FC040 0x0002
monitor mdw 0xE01FC040
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/LPC2148Test/prj/eclipse_rom.gdb b/testing/examples/LPC2148Test/prj/eclipse_rom.gdb
index 86780056d..3d372a059 100644
--- a/testing/examples/LPC2148Test/prj/eclipse_rom.gdb
+++ b/testing/examples/LPC2148Test/prj/eclipse_rom.gdb
@@ -8,4 +8,4 @@ monitor mww 0xE01FC040 0x0002
monitor mdw 0xE01FC040
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/LPC2294Test/makefile b/testing/examples/LPC2294Test/makefile
index 6af02fbe1..9ac7fe867 100644
--- a/testing/examples/LPC2294Test/makefile
+++ b/testing/examples/LPC2294Test/makefile
@@ -144,4 +144,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/LPC2294Test/prj/eclipse_ram.gdb b/testing/examples/LPC2294Test/prj/eclipse_ram.gdb
index 4f423124d..ea0e21fc3 100644
--- a/testing/examples/LPC2294Test/prj/eclipse_ram.gdb
+++ b/testing/examples/LPC2294Test/prj/eclipse_ram.gdb
@@ -8,4 +8,4 @@ monitor mww 0xE01FC040 0x0002
monitor mdw 0xE01FC040
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/LPC2294Test/prj/eclipse_rom.gdb b/testing/examples/LPC2294Test/prj/eclipse_rom.gdb
index 86780056d..3d372a059 100644
--- a/testing/examples/LPC2294Test/prj/eclipse_rom.gdb
+++ b/testing/examples/LPC2294Test/prj/eclipse_rom.gdb
@@ -8,4 +8,4 @@ monitor mww 0xE01FC040 0x0002
monitor mdw 0xE01FC040
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/SAM7S256Test/makefile b/testing/examples/SAM7S256Test/makefile
index 9e1e83f8e..dabe9a3d8 100644
--- a/testing/examples/SAM7S256Test/makefile
+++ b/testing/examples/SAM7S256Test/makefile
@@ -143,4 +143,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/SAM7S256Test/results/607.html b/testing/examples/SAM7S256Test/results/607.html
index 852c0ad67..e097586ee 100644
--- a/testing/examples/SAM7S256Test/results/607.html
+++ b/testing/examples/SAM7S256Test/results/607.html
@@ -695,4 +695,4 @@ Note: these tests are not designed to test/debug the target, but to test functio
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/examples/SAM7X256Test/makefile b/testing/examples/SAM7X256Test/makefile
index 4ad44cf0b..4a5a730da 100644
--- a/testing/examples/SAM7X256Test/makefile
+++ b/testing/examples/SAM7X256Test/makefile
@@ -143,4 +143,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/STM32-103/readme.txt b/testing/examples/STM32-103/readme.txt
index 39b080dd6..f41a03df0 100644
--- a/testing/examples/STM32-103/readme.txt
+++ b/testing/examples/STM32-103/readme.txt
@@ -3,4 +3,4 @@ Olimex STM32-p103 board.
main.elf is a file that can be programmed to flash for
testing purposes(e.g. test GDB load performance).
-http://www.olimex.com/dev/stm32-p103.html
\ No newline at end of file
+http://www.olimex.com/dev/stm32-p103.html
diff --git a/testing/examples/STR710JtagSpeed/makefile b/testing/examples/STR710JtagSpeed/makefile
index 816ab233e..72be7159b 100644
--- a/testing/examples/STR710JtagSpeed/makefile
+++ b/testing/examples/STR710JtagSpeed/makefile
@@ -131,4 +131,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/STR710Test/makefile b/testing/examples/STR710Test/makefile
index 1450b73d5..adac2433a 100644
--- a/testing/examples/STR710Test/makefile
+++ b/testing/examples/STR710Test/makefile
@@ -143,4 +143,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/examples/STR710Test/prj/eclipse_ram.gdb b/testing/examples/STR710Test/prj/eclipse_ram.gdb
index 511ed5914..80efec42d 100644
--- a/testing/examples/STR710Test/prj/eclipse_ram.gdb
+++ b/testing/examples/STR710Test/prj/eclipse_ram.gdb
@@ -8,4 +8,4 @@ monitor mww 0xA0000050 0x01c2
monitor mdw 0xA0000050
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/STR710Test/prj/eclipse_rom.gdb b/testing/examples/STR710Test/prj/eclipse_rom.gdb
index 9e2c37005..d8eaf1e9f 100644
--- a/testing/examples/STR710Test/prj/eclipse_rom.gdb
+++ b/testing/examples/STR710Test/prj/eclipse_rom.gdb
@@ -8,4 +8,4 @@ monitor mww 0xA0000050 0x01c2
monitor mdw 0xA0000050
load
break main
-continue
\ No newline at end of file
+continue
diff --git a/testing/examples/STR912Test/makefile b/testing/examples/STR912Test/makefile
index ee7685795..6f8309eab 100644
--- a/testing/examples/STR912Test/makefile
+++ b/testing/examples/STR912Test/makefile
@@ -143,4 +143,4 @@ clean:
#
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***
diff --git a/testing/results/template.html b/testing/results/template.html
index 286bf2e3a..ffc9bbf1f 100644
--- a/testing/results/template.html
+++ b/testing/results/template.html
@@ -15,4 +15,4 @@
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/results/v0.4.0-rc1/AT91FR40162.html b/testing/results/v0.4.0-rc1/AT91FR40162.html
index 0baa31e6b..8dcdf487c 100755
--- a/testing/results/v0.4.0-rc1/AT91FR40162.html
+++ b/testing/results/v0.4.0-rc1/AT91FR40162.html
@@ -853,4 +853,4 @@ Note: these tests are not designed to test/debug the target, but to test functio
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/results/v0.4.0-rc1/LPC2148.html b/testing/results/v0.4.0-rc1/LPC2148.html
index 425b52484..24d101129 100755
--- a/testing/results/v0.4.0-rc1/LPC2148.html
+++ b/testing/results/v0.4.0-rc1/LPC2148.html
@@ -930,4 +930,4 @@ Note: these tests are not designed to test/debug the target, but to test functio
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/results/v0.4.0-rc1/SAM7.html b/testing/results/v0.4.0-rc1/SAM7.html
index a400a476f..9dcabf88c 100755
--- a/testing/results/v0.4.0-rc1/SAM7.html
+++ b/testing/results/v0.4.0-rc1/SAM7.html
@@ -850,4 +850,4 @@ Note: these tests are not designed to test/debug the target, but to test functio
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/results/v0.4.0-rc1/STR710.html b/testing/results/v0.4.0-rc1/STR710.html
index 1a18ad0e6..075d549e3 100755
--- a/testing/results/v0.4.0-rc1/STR710.html
+++ b/testing/results/v0.4.0-rc1/STR710.html
@@ -904,4 +904,4 @@ The current source language is "auto; currently asm".<br>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/results/v0.4.0-rc1/STR912.html b/testing/results/v0.4.0-rc1/STR912.html
index c8df03488..e9be17b98 100755
--- a/testing/results/v0.4.0-rc1/STR912.html
+++ b/testing/results/v0.4.0-rc1/STR912.html
@@ -1005,4 +1005,4 @@ verified 420 bytes in 0.350000s (1.172 kb/s)<br>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/testcases.html b/testing/testcases.html
index a151e9f68..13b9e7256 100644
--- a/testing/testcases.html
+++ b/testing/testcases.html
@@ -563,4 +563,4 @@ Note: these tests are not designed to test/debug the target, but to test functio
</table>
</body>
-</html>
\ No newline at end of file
+</html>
commit e7306d361b5d503cf27dfb3dc69298ddad495f88
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 5 21:26:56 2019 +0200
coding style: fix space around pointer's asterisk
The script checkpatch available in new Linux kernel offers an
experimental feature for automatically fix the code in place.
While still experimental, the feature works quite well for simple
fixes, like spacing.
This patch has been created automatically with the script under
review for inclusion in OpenOCD, using the command
find src/ -type f -exec ./tools/scripts/checkpatch.pl \
-q --types POINTER_LOCATION --fix-inplace -f {} \;
then manually reviewed.
OpenOCD coding style does not mention the space around pointer's
asterisk, so no check is enforced. This patch only makes the style
uniform across the files.
The patch only changes amount and position of whitespace, thus
the following commands show empty diff
git diff -w
git log -w -p
git log -w --stat
Change-Id: Iefb4998e69bebdfe0d1ae65cadfc8d2c4f166d13
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5197
Tested-by: jenkins
diff --git a/src/flash/nor/dsp5680xx_flash.c b/src/flash/nor/dsp5680xx_flash.c
index 37b60f001..da675856f 100644
--- a/src/flash/nor/dsp5680xx_flash.c
+++ b/src/flash/nor/dsp5680xx_flash.c
@@ -154,7 +154,7 @@ static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
*
* @return
*/
-static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_t* buffer,
+static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count)
{
int retval;
diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
index 9e18136fa..c6dbfb851 100644
--- a/src/flash/nor/numicro.c
+++ b/src/flash/nor/numicro.c
@@ -1216,7 +1216,7 @@ static int numicro_init_isp(struct target *target)
return ERROR_OK;
}
-static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t addr, uint32_t wdata, uint32_t* rdata)
+static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t addr, uint32_t wdata, uint32_t *rdata)
{
uint32_t timeout, status;
int retval = ERROR_OK;
@@ -1649,7 +1649,7 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer,
return ERROR_OK;
}
-static int numicro_get_cpu_type(struct target *target, const struct numicro_cpu_type** cpu)
+static int numicro_get_cpu_type(struct target *target, const struct numicro_cpu_type **cpu)
{
uint32_t part_id;
int retval = ERROR_OK;
diff --git a/src/flash/nor/sim3x.c b/src/flash/nor/sim3x.c
index 7ccf56b6e..4e39705fd 100644
--- a/src/flash/nor/sim3x.c
+++ b/src/flash/nor/sim3x.c
@@ -471,7 +471,7 @@ static int sim3x_write_block(struct flash_bank *bank, const uint8_t *buf,
return ret;
}
-static int sim3x_flash_write(struct flash_bank *bank, const uint8_t * buffer, uint32_t offset, uint32_t count)
+static int sim3x_flash_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
{
int ret;
struct target *target;
diff --git a/src/helper/types.h b/src/helper/types.h
index 5e35c13b7..b6747f8d4 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -126,17 +126,17 @@ static inline uint64_t le_to_h_u64(const uint8_t *buf)
(uint64_t)buf[7] << 56);
}
-static inline uint32_t le_to_h_u32(const uint8_t* buf)
+static inline uint32_t le_to_h_u32(const uint8_t *buf)
{
return (uint32_t)((uint32_t)buf[0] | (uint32_t)buf[1] << 8 | (uint32_t)buf[2] << 16 | (uint32_t)buf[3] << 24);
}
-static inline uint32_t le_to_h_u24(const uint8_t* buf)
+static inline uint32_t le_to_h_u24(const uint8_t *buf)
{
return (uint32_t)((uint32_t)buf[0] | (uint32_t)buf[1] << 8 | (uint32_t)buf[2] << 16);
}
-static inline uint16_t le_to_h_u16(const uint8_t* buf)
+static inline uint16_t le_to_h_u16(const uint8_t *buf)
{
return (uint16_t)((uint16_t)buf[0] | (uint16_t)buf[1] << 8);
}
@@ -153,17 +153,17 @@ static inline uint64_t be_to_h_u64(const uint8_t *buf)
(uint64_t)buf[0] << 56);
}
-static inline uint32_t be_to_h_u32(const uint8_t* buf)
+static inline uint32_t be_to_h_u32(const uint8_t *buf)
{
return (uint32_t)((uint32_t)buf[3] | (uint32_t)buf[2] << 8 | (uint32_t)buf[1] << 16 | (uint32_t)buf[0] << 24);
}
-static inline uint32_t be_to_h_u24(const uint8_t* buf)
+static inline uint32_t be_to_h_u24(const uint8_t *buf)
{
return (uint32_t)((uint32_t)buf[2] | (uint32_t)buf[1] << 8 | (uint32_t)buf[0] << 16);
}
-static inline uint16_t be_to_h_u16(const uint8_t* buf)
+static inline uint16_t be_to_h_u16(const uint8_t *buf)
{
return (uint16_t)((uint16_t)buf[1] | (uint16_t)buf[0] << 8);
}
@@ -192,7 +192,7 @@ static inline void h_u64_to_be(uint8_t *buf, int64_t val)
buf[7] = (uint8_t) (val >> 0);
}
-static inline void h_u32_to_le(uint8_t* buf, int val)
+static inline void h_u32_to_le(uint8_t *buf, int val)
{
buf[3] = (uint8_t) (val >> 24);
buf[2] = (uint8_t) (val >> 16);
@@ -200,7 +200,7 @@ static inline void h_u32_to_le(uint8_t* buf, int val)
buf[0] = (uint8_t) (val >> 0);
}
-static inline void h_u32_to_be(uint8_t* buf, int val)
+static inline void h_u32_to_be(uint8_t *buf, int val)
{
buf[0] = (uint8_t) (val >> 24);
buf[1] = (uint8_t) (val >> 16);
@@ -208,27 +208,27 @@ static inline void h_u32_to_be(uint8_t* buf, int val)
buf[3] = (uint8_t) (val >> 0);
}
-static inline void h_u24_to_le(uint8_t* buf, int val)
+static inline void h_u24_to_le(uint8_t *buf, int val)
{
buf[2] = (uint8_t) (val >> 16);
buf[1] = (uint8_t) (val >> 8);
buf[0] = (uint8_t) (val >> 0);
}
-static inline void h_u24_to_be(uint8_t* buf, int val)
+static inline void h_u24_to_be(uint8_t *buf, int val)
{
buf[0] = (uint8_t) (val >> 16);
buf[1] = (uint8_t) (val >> 8);
buf[2] = (uint8_t) (val >> 0);
}
-static inline void h_u16_to_le(uint8_t* buf, int val)
+static inline void h_u16_to_le(uint8_t *buf, int val)
{
buf[1] = (uint8_t) (val >> 8);
buf[0] = (uint8_t) (val >> 0);
}
-static inline void h_u16_to_be(uint8_t* buf, int val)
+static inline void h_u16_to_be(uint8_t *buf, int val)
{
buf[0] = (uint8_t) (val >> 8);
buf[1] = (uint8_t) (val >> 0);
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 40d076ecf..a9cdbbe1e 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -213,7 +213,7 @@ static int ftdi_set_signal(const struct signal *s, char value)
return ERROR_OK;
}
-static int ftdi_get_signal(const struct signal *s, uint16_t * value_out)
+static int ftdi_get_signal(const struct signal *s, uint16_t *value_out)
{
uint8_t data_low = 0;
uint8_t data_high = 0;
diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c
index 9a570b098..3323557b7 100644
--- a/src/jtag/drivers/osbdm.c
+++ b/src/jtag/drivers/osbdm.c
@@ -297,7 +297,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
return ERROR_OK;
}
-static int osbdm_flush(struct osbdm *osbdm, struct queue* queue)
+static int osbdm_flush(struct osbdm *osbdm, struct queue *queue)
{
uint8_t tms[DIV_ROUND_UP(OSBDM_SWAP_MAX, 8)];
uint8_t tdi[DIV_ROUND_UP(OSBDM_SWAP_MAX, 8)];
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index ff1783158..7f033e0e7 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -162,8 +162,8 @@ void jtag_tap_free(struct jtag_tap *tap);
struct jtag_tap *jtag_all_taps(void);
const char *jtag_tap_name(const struct jtag_tap *tap);
-struct jtag_tap *jtag_tap_by_string(const char* dotted_name);
-struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj *obj);
+struct jtag_tap *jtag_tap_by_string(const char *dotted_name);
+struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *obj);
struct jtag_tap *jtag_tap_by_position(unsigned abs_position);
struct jtag_tap *jtag_tap_next_enabled(struct jtag_tap *p);
unsigned jtag_tap_count_enabled(void);
diff --git a/src/rtos/embKernel.c b/src/rtos/embKernel.c
index 8a307f198..42d2a8cd0 100644
--- a/src/rtos/embKernel.c
+++ b/src/rtos/embKernel.c
@@ -135,7 +135,7 @@ static int embKernel_create(struct target *target)
}
static int embKernel_get_tasks_details(struct rtos *rtos, int64_t iterable, const struct embKernel_params *param,
- struct thread_detail *details, const char* state_str)
+ struct thread_detail *details, const char *state_str)
{
int64_t task = 0;
int retval = target_read_buffer(rtos->target, iterable + param->iterable_task_owner_offset, param->pointer_width,
diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index 6646ad4de..f45c15d23 100644
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -106,7 +106,7 @@ static int mqx_valid_address_check(
)
{
enum mqx_arch arch_type = ((struct mqx_params *)rtos->rtos_specific_params)->target_arch;
- const char * targetname = ((struct mqx_params *)rtos->rtos_specific_params)->target_name;
+ const char *targetname = ((struct mqx_params *)rtos->rtos_specific_params)->target_name;
/* Cortex-M address range */
if (arch_type == mqx_arch_cortexm) {
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 9f1cb7b07..0ca4fa4ee 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2031,7 +2031,7 @@ static int lookup_add_arch_defined_types(char const **arch_defined_types_list[],
static int gdb_generate_reg_type_description(struct target *target,
char **tdesc, int *pos, int *size, struct reg_data_type *type,
- char const **arch_defined_types_list[], int * num_arch_defined_types)
+ char const **arch_defined_types_list[], int *num_arch_defined_types)
{
int retval = ERROR_OK;
diff --git a/src/target/avrt.c b/src/target/avrt.c
index 1e1898c7e..9cb6f2f34 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -145,7 +145,7 @@ static int avr_deassert_reset(struct target *target)
return ERROR_OK;
}
-int avr_jtag_senddat(struct jtag_tap *tap, uint32_t* dr_in, uint32_t dr_out,
+int avr_jtag_senddat(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out,
int len)
{
return mcu_write_dr_u32(tap, dr_in, dr_out, len, 1);
diff --git a/src/target/dsp563xx_once.c b/src/target/dsp563xx_once.c
index fe4927ba3..65ef7070b 100644
--- a/src/target/dsp563xx_once.c
+++ b/src/target/dsp563xx_once.c
@@ -46,7 +46,7 @@
#define JTAG_INSTR_BYPASS 0x0F
/** */
-static inline int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t * dr_in, uint8_t * dr_out, int dr_len, int rti)
+static inline int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
{
jtag_add_plain_dr_scan(dr_len, dr_out, dr_in, TAP_IDLE);
@@ -54,13 +54,13 @@ static inline int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t * dr_in, uint8
}
/** */
-static inline int dsp563xx_write_dr_u8(struct jtag_tap *tap, uint8_t * dr_in, uint8_t dr_out, int dr_len, int rti)
+static inline int dsp563xx_write_dr_u8(struct jtag_tap *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
{
return dsp563xx_write_dr(tap, dr_in, &dr_out, dr_len, rti);
}
/** */
-static inline int dsp563xx_write_dr_u32(struct jtag_tap *tap, uint32_t * dr_in, uint32_t dr_out, int dr_len, int rti)
+static inline int dsp563xx_write_dr_u32(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int dr_len, int rti)
{
return dsp563xx_write_dr(tap, (uint8_t *) dr_in, (uint8_t *) &dr_out, dr_len, rti);
}
@@ -79,19 +79,19 @@ static inline int dsp563xx_once_ir_exec(struct jtag_tap *tap, int flush, uint8_t
}
/* IR and DR functions */
-static inline int dsp563xx_write_ir(struct jtag_tap *tap, uint8_t * ir_in, uint8_t * ir_out, int ir_len, int rti)
+static inline int dsp563xx_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti)
{
jtag_add_plain_ir_scan(tap->ir_length, ir_out, ir_in, TAP_IDLE);
return ERROR_OK;
}
-static inline int dsp563xx_write_ir_u8(struct jtag_tap *tap, uint8_t * ir_in, uint8_t ir_out, int ir_len, int rti)
+static inline int dsp563xx_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti)
{
return dsp563xx_write_ir(tap, ir_in, &ir_out, ir_len, rti);
}
-static inline int dsp563xx_jtag_sendinstr(struct jtag_tap *tap, uint8_t * ir_in, uint8_t ir_out)
+static inline int dsp563xx_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out)
{
return dsp563xx_write_ir_u8(tap, ir_in, ir_out, tap->ir_length, 1);
}
@@ -195,7 +195,7 @@ int dsp563xx_once_read_register(struct jtag_tap *tap, int flush, struct once_reg
}
/** once read register with register len */
-int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t * data)
+int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data)
{
int err;
@@ -212,7 +212,7 @@ int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint
}
/** once read register */
-int dsp563xx_once_reg_read(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t * data)
+int dsp563xx_once_reg_read(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t *data)
{
int err;
diff --git a/src/target/dsp563xx_once.h b/src/target/dsp563xx_once.h
index da7f5e9b8..811c08698 100644
--- a/src/target/dsp563xx_once.h
+++ b/src/target/dsp563xx_once.h
@@ -76,9 +76,9 @@ int dsp563xx_once_target_status(struct jtag_tap *tap);
/** once read registers */
int dsp563xx_once_read_register(struct jtag_tap *tap, int flush, struct once_reg *regs, int len);
/** once read register */
-int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t * data);
+int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data);
/** once read register */
-int dsp563xx_once_reg_read(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t * data);
+int dsp563xx_once_reg_read(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t *data);
/** once write register */
int dsp563xx_once_reg_write(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t data);
/** single word instruction */
diff --git a/src/target/dsp5680xx.h b/src/target/dsp5680xx.h
index 842796bc7..72557cea2 100644
--- a/src/target/dsp5680xx.h
+++ b/src/target/dsp5680xx.h
@@ -315,7 +315,7 @@ static inline struct dsp5680xx_common *target_to_dsp5680xx(struct target
*
* @return
*/
-int dsp5680xx_f_wr(struct target *target, const uint8_t * buffer, uint32_t address,
+int dsp5680xx_f_wr(struct target *target, const uint8_t *buffer, uint32_t address,
uint32_t count, int is_flash_lock);
/**
@@ -329,7 +329,7 @@ int dsp5680xx_f_wr(struct target *target, const uint8_t * buffer, uint32_t addre
*
* @return
*/
-int dsp5680xx_f_erase_check(struct target *target, uint8_t * erased,
+int dsp5680xx_f_erase_check(struct target *target, uint8_t *erased,
uint32_t sector);
/**
@@ -354,7 +354,7 @@ int dsp5680xx_f_erase(struct target *target, int first, int last);
*
* @return
*/
-int dsp5680xx_f_protect_check(struct target *target, uint16_t * protected);
+int dsp5680xx_f_protect_check(struct target *target, uint16_t *protected);
/**
* Writes the flash security words with a specific value. The chip's security will be
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 5683e5a3f..1e5c02764 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -66,7 +66,7 @@ static int write_memory(struct target *target, target_addr_t address,
uint32_t size, uint32_t count, const uint8_t *buffer);
static int riscv013_test_sba_config_reg(struct target *target, target_addr_t legal_address,
uint32_t num_words, target_addr_t illegal_address, bool run_sbbusyerror_test);
-void write_memory_sba_simple(struct target *target, target_addr_t addr, uint32_t* write_data,
+void write_memory_sba_simple(struct target *target, target_addr_t addr, uint32_t *write_data,
uint32_t write_size, uint32_t sbcs);
void read_memory_sba_simple(struct target *target, target_addr_t addr,
uint32_t *rd_buf, uint32_t read_size, uint32_t sbcs);
diff --git a/src/target/target.c b/src/target/target.c
index 936a5da0d..688d31890 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2281,7 +2281,7 @@ static int target_read_buffer_default(struct target *target, target_addr_t addre
return ERROR_OK;
}
-int target_checksum_memory(struct target *target, target_addr_t address, uint32_t size, uint32_t* crc)
+int target_checksum_memory(struct target *target, target_addr_t address, uint32_t size, uint32_t *crc)
{
uint8_t *buffer;
int retval;
-----------------------------------------------------------------------
Summary of changes:
contrib/loaders/flash/at91sam7x/makefile | 2 +-
src/flash/nor/dsp5680xx_flash.c | 2 +-
src/flash/nor/numicro.c | 4 ++--
src/flash/nor/sim3x.c | 2 +-
src/helper/types.h | 24 ++++++++++++------------
src/jtag/drivers/ftdi.c | 2 +-
src/jtag/drivers/osbdm.c | 2 +-
src/jtag/jtag.h | 4 ++--
src/rtos/embKernel.c | 2 +-
src/rtos/mqx.c | 2 +-
src/server/gdb_server.c | 2 +-
src/target/avrt.c | 2 +-
src/target/dsp563xx_once.c | 16 ++++++++--------
src/target/dsp563xx_once.h | 4 ++--
src/target/dsp5680xx.h | 6 +++---
src/target/riscv/riscv-013.c | 2 +-
src/target/target.c | 2 +-
tcl/board/hilscher_nxhx10.cfg | 2 +-
tcl/board/iar_str912_sk.cfg | 2 +-
tcl/board/twr-vf65gs10_cmsisdap.cfg | 2 +-
tcl/interface/imx-native.cfg | 2 +-
tcl/interface/openjtag.cfg | 2 +-
tcl/target/c100config.tcl | 2 +-
testing/examples/AT91R40008Test/makefile | 2 +-
testing/examples/LPC2148Test/makefile | 2 +-
testing/examples/LPC2148Test/prj/eclipse_ram.gdb | 2 +-
testing/examples/LPC2148Test/prj/eclipse_rom.gdb | 2 +-
testing/examples/LPC2294Test/makefile | 2 +-
testing/examples/LPC2294Test/prj/eclipse_ram.gdb | 2 +-
testing/examples/LPC2294Test/prj/eclipse_rom.gdb | 2 +-
testing/examples/SAM7S256Test/makefile | 2 +-
testing/examples/SAM7S256Test/results/607.html | 2 +-
testing/examples/SAM7X256Test/makefile | 2 +-
testing/examples/STM32-103/readme.txt | 2 +-
testing/examples/STR710JtagSpeed/makefile | 2 +-
testing/examples/STR710Test/makefile | 2 +-
testing/examples/STR710Test/prj/eclipse_ram.gdb | 2 +-
testing/examples/STR710Test/prj/eclipse_rom.gdb | 2 +-
testing/examples/STR912Test/makefile | 2 +-
testing/results/template.html | 2 +-
testing/results/v0.4.0-rc1/AT91FR40162.html | 2 +-
testing/results/v0.4.0-rc1/LPC2148.html | 2 +-
testing/results/v0.4.0-rc1/SAM7.html | 2 +-
testing/results/v0.4.0-rc1/STR710.html | 2 +-
testing/results/v0.4.0-rc1/STR912.html | 2 +-
testing/testcases.html | 2 +-
46 files changed, 69 insertions(+), 69 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:31:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 86d8c05eb68866297cbc1ec5f90d3d1634c69a1e (commit)
from beb610555ad826dda874eee0428deeb1c00ac39d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 86d8c05eb68866297cbc1ec5f90d3d1634c69a1e
Author: Antonio Borneo <bor...@gm...>
Date: Fri Jun 14 10:00:06 2019 +0200
log: let command "log_output" to set back its default
The default log output is stderr. After the command "log_output"
has been used to set an output log file, it is possible to return
back to stderr only on *NIX hosts specifying a new log output file
as "/dev/stderr", but this is not intuitive, not documented and
not portable out of *NIX.
Make command "log_output" able to set back the default output to
stderr when the parameter is either "default" or is missing.
While there, add debug message to log the change and make the
command return error on incorrect syntax.
Change-Id: I8c7c929780f58e2c23936737c8e7274a96734786
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5233
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index de7dceb78..d059cfae2 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -7791,9 +7791,9 @@ echo "Downloading kernel -- please wait"
@end example
@end deffn
-@deffn Command log_output [filename]
-Redirect logging to @var{filename};
-the initial log output channel is stderr.
+@deffn Command log_output [filename | "default"]
+Redirect logging to @var{filename} or set it back to default output;
+the default log output channel is stderr.
@end deffn
@deffn Command add_script_search_dir [directory]
diff --git a/src/helper/log.c b/src/helper/log.c
index 8f48b928b..ae26df5a1 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -220,6 +220,15 @@ COMMAND_HANDLER(handle_debug_level_command)
COMMAND_HANDLER(handle_log_output_command)
{
+ if (CMD_ARGC == 0 || (CMD_ARGC == 1 && strcmp(CMD_ARGV[0], "default") == 0)) {
+ if (log_output != stderr && log_output != NULL) {
+ /* Close previous log file, if it was open and wasn't stderr. */
+ fclose(log_output);
+ }
+ log_output = stderr;
+ LOG_DEBUG("set log_output to default");
+ return ERROR_OK;
+ }
if (CMD_ARGC == 1) {
FILE *file = fopen(CMD_ARGV[0], "w");
if (file == NULL) {
@@ -231,9 +240,11 @@ COMMAND_HANDLER(handle_log_output_command)
fclose(log_output);
}
log_output = file;
+ LOG_DEBUG("set log_output to \"%s\"", CMD_ARGV[0]);
+ return ERROR_OK;
}
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
static const struct command_registration log_command_handlers[] = {
@@ -242,7 +253,7 @@ static const struct command_registration log_command_handlers[] = {
.handler = handle_log_output_command,
.mode = COMMAND_ANY,
.help = "redirect logging to a file (default: stderr)",
- .usage = "file_name",
+ .usage = "[file_name | \"default\"]",
},
{
.name = "debug_level",
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 6 +++---
src/helper/log.c | 15 +++++++++++++--
2 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:29:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via beb610555ad826dda874eee0428deeb1c00ac39d (commit)
from 066aa24e85532b555e1fd34850327e7f7a570bf8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit beb610555ad826dda874eee0428deeb1c00ac39d
Author: Antonio Borneo <bor...@gm...>
Date: Thu Jan 23 15:18:33 2020 +0100
adi_v5_dapdirect: fix connect under reset
Deassert the reset only if connect under reset is not required;
otherwise, assert the reset.
This fix aligns the behavior of connect under reset in dapdirect
with the behavior in jtag and swd.
Change-Id: I937ef4320b44e51ef6cb0e349e12348dbfbe4abb
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5415
Tested-by: jenkins
diff --git a/src/target/adi_v5_dapdirect.c b/src/target/adi_v5_dapdirect.c
index f12015198..c0deee165 100644
--- a/src/target/adi_v5_dapdirect.c
+++ b/src/target/adi_v5_dapdirect.c
@@ -179,9 +179,18 @@ static int dapdirect_swd_select(struct command_context *ctx)
static int dapdirect_init(struct command_context *ctx)
{
+ enum reset_types jtag_reset_config = jtag_get_reset_config();
+
LOG_DEBUG("dapdirect_init()");
- adapter_deassert_reset();
+ if (jtag_reset_config & RESET_CNCT_UNDER_SRST) {
+ if (jtag_reset_config & RESET_SRST_NO_GATING)
+ adapter_assert_reset();
+ else
+ LOG_WARNING("\'srst_nogate\' reset_config option is required");
+ } else
+ adapter_deassert_reset();
+
return ERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
src/target/adi_v5_dapdirect.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:27:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 066aa24e85532b555e1fd34850327e7f7a570bf8 (commit)
from 98e9d96239af353bca3bad1bf5f4c809e8cc843b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 066aa24e85532b555e1fd34850327e7f7a570bf8
Author: Marc Schink <de...@za...>
Date: Mon Feb 10 15:37:45 2020 +0100
flash/nor/stm32l4x: Minor code cleanups
Change-Id: I3053bbe888ac1f0a0593ef51bf9ca564f1cc27ec
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/5449
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index e9fb77e03..abbb75b46 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -142,7 +142,7 @@ struct stm32l4_part_info {
};
struct stm32l4_flash_bank {
- int probed;
+ bool probed;
uint32_t idcode;
int bank1_sectors;
bool dual_bank_mode;
@@ -282,7 +282,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32l4_flash_bank_command)
* Ask the flash infrastructure to ensure required alignment */
bank->write_start_alignment = bank->write_end_alignment = 8;
- stm32l4_info->probed = 0;
+ stm32l4_info->probed = false;
return ERROR_OK;
}
@@ -725,12 +725,11 @@ static int stm32l4_probe(struct flash_bank *bank)
struct target *target = bank->target;
struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
const struct stm32l4_part_info *part_info;
- int i;
uint16_t flash_size_in_kb = 0xffff;
uint32_t device_id;
uint32_t options;
- stm32l4_info->probed = 0;
+ stm32l4_info->probed = false;
/* read stm32 device id register */
int retval = stm32l4_read_idcode(bank, &stm32l4_info->idcode);
@@ -875,7 +874,7 @@ static int stm32l4_probe(struct flash_bank *bank)
return ERROR_FAIL;
}
- for (i = 0; i < bank->num_sectors; i++) {
+ for (int i = 0; i < bank->num_sectors; i++) {
bank->sectors[i].offset = i * page_size;
/* in dual bank configuration, if there is a gap between banks
* we fix up the sector offset to consider this gap */
@@ -886,7 +885,7 @@ static int stm32l4_probe(struct flash_bank *bank)
bank->sectors[i].is_protected = 1;
}
- stm32l4_info->probed = 1;
+ stm32l4_info->probed = true;
return ERROR_OK;
}
@@ -976,8 +975,6 @@ err_lock:
COMMAND_HANDLER(stm32l4_handle_mass_erase_command)
{
- int i;
-
if (CMD_ARGC < 1) {
command_print(CMD, "stm32l4x mass_erase <STM32L4 bank>");
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -991,7 +988,7 @@ COMMAND_HANDLER(stm32l4_handle_mass_erase_command)
retval = stm32l4_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
- for (i = 0; i < bank->num_sectors; i++)
+ for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1;
command_print(CMD, "stm32l4x mass erase complete");
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32l4x.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-24 10:26:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 98e9d96239af353bca3bad1bf5f4c809e8cc843b (commit)
via 608105dff81c5035886d76d8528412139a56c4a7 (commit)
from 22df29eee8033be5dd9bdf2429701fa2252dd80b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 98e9d96239af353bca3bad1bf5f4c809e8cc843b
Author: Marc Schink <de...@za...>
Date: Mon Feb 10 15:39:19 2020 +0100
flash/nor/stm32h7x: Minor code cleanups
Change-Id: Ia212b1877abeda27f507de29a3aee2b171c1b8c6
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/5448
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
Reviewed-by: Christopher Head <ch...@za...>
diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index bf003684c..d5b5daab2 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -123,7 +123,7 @@ struct stm32h7x_part_info {
};
struct stm32h7x_flash_bank {
- int probed;
+ bool probed;
uint32_t idcode;
uint32_t user_bank_size;
uint32_t flash_regs_base; /* Address of flash reg controller */
@@ -167,7 +167,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info = malloc(sizeof(struct stm32h7x_flash_bank));
bank->driver_priv = stm32x_info;
- stm32x_info->probed = 0;
+ stm32x_info->probed = false;
stm32x_info->user_bank_size = bank->size;
bank->write_start_alignment = FLASH_BLOCK_SIZE;
@@ -701,13 +701,12 @@ static int stm32x_probe(struct flash_bank *bank)
{
struct target *target = bank->target;
struct stm32h7x_flash_bank *stm32x_info = bank->driver_priv;
- int i;
uint16_t flash_size_in_kb;
uint32_t device_id;
uint32_t base_address = FLASH_BANK0_ADDRESS;
uint32_t second_bank_base;
- stm32x_info->probed = 0;
+ stm32x_info->probed = false;
stm32x_info->part_info = NULL;
int retval = stm32x_read_id_code(bank, &stm32x_info->idcode);
@@ -803,12 +802,12 @@ static int stm32x_probe(struct flash_bank *bank)
/* fixed memory */
setup_sector(bank, 0, num_pages, stm32x_info->part_info->page_size * 1024);
- for (i = 0; i < num_pages; i++) {
+ for (int i = 0; i < num_pages; i++) {
bank->sectors[i].is_erased = -1;
bank->sectors[i].is_protected = 0;
}
- stm32x_info->probed = 1;
+ stm32x_info->probed = true;
return ERROR_OK;
}
@@ -980,8 +979,6 @@ flash_lock:
COMMAND_HANDLER(stm32x_handle_mass_erase_command)
{
- int i;
-
if (CMD_ARGC < 1) {
command_print(CMD, "stm32h7x mass_erase <bank>");
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -995,7 +992,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
retval = stm32x_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
- for (i = 0; i < bank->num_sectors; i++)
+ for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1;
command_print(CMD, "stm32h7x mass erase complete");
commit 608105dff81c5035886d76d8528412139a56c4a7
Author: Mara Bos <m-...@m-...>
Date: Fri Aug 9 11:59:24 2019 +0200
Support bitbanging on 64-bit ARM CPUs.
The configure.ac file restricted this to only 'arm' CPUs, but
${host_cpu} is 'aarch64' (not 'arm') for 64 bit ARM CPUs.
Tested on a Raspberry Pi compute module 3.
Change-Id: I6cb1d7e7fadc51dbb12419176f1faf0a0cb0b228
Signed-off-by: Mara Bos <m-...@m-...>
Reviewed-on: http://openocd.zylin.com/5274
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/configure.ac b/configure.ac
index e86d33f88..e87959c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,6 +277,20 @@ AC_ARG_ENABLE([ioutil],
AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]),
[build_ioutil=$enableval], [build_ioutil=no])
+AS_CASE(["${host_cpu}"],
+ [arm*|aarch64], [
+ AC_ARG_ENABLE([bcm2835gpio],
+ AS_HELP_STRING([--enable-bcm2835gpio], [Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi)]),
+ [build_bcm2835gpio=$enableval], [build_bcm2835gpio=no])
+ AC_ARG_ENABLE([imx_gpio],
+ AS_HELP_STRING([--enable-imx_gpio], [Enable building support for bitbanging on NXP IMX processors]),
+ [build_imx_gpio=$enableval], [build_imx_gpio=no])
+ ],
+ [
+ build_bcm2835gpio=no
+ build_imx_gpio=no
+])
+
AS_CASE(["${host_cpu}"],
[arm*], [
AC_ARG_ENABLE([ep93xx],
@@ -286,19 +300,10 @@ AS_CASE(["${host_cpu}"],
AC_ARG_ENABLE([at91rm9200],
AS_HELP_STRING([--enable-at91rm9200], [Enable building support for AT91RM9200 based SBCs]),
[build_at91rm9200=$enableval], [build_at91rm9200=no])
-
- AC_ARG_ENABLE([bcm2835gpio],
- AS_HELP_STRING([--enable-bcm2835gpio], [Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi)]),
- [build_bcm2835gpio=$enableval], [build_bcm2835gpio=no])
- AC_ARG_ENABLE([imx_gpio],
- AS_HELP_STRING([--enable-imx_gpio], [Enable building support for bitbanging on NXP IMX processors]),
- [build_imx_gpio=$enableval], [build_imx_gpio=no])
],
[
build_ep93xx=no
build_at91rm9200=no
- build_bcm2835gpio=no
- build_imx_gpio=no
])
AC_ARG_ENABLE([gw16012],
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 23 ++++++++++++++---------
src/flash/nor/stm32h7x.c | 15 ++++++---------
2 files changed, 20 insertions(+), 18 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 21:38:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 22df29eee8033be5dd9bdf2429701fa2252dd80b (commit)
from 35f846fd52e27fabcdea383a6be5056a9213c939 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 22df29eee8033be5dd9bdf2429701fa2252dd80b
Author: Tarek BOCHKATI <tar...@gm...>
Date: Wed Feb 12 12:14:06 2020 +0100
tcl/board: update ST NUCLEO-H745ZI-Q configuration file to use dapdirect
this board embeds and STLINK DAP capable firmware
Change-Id: I276e9f44ad6cf7d1ff664898bbc884676bdbc967
Signed-off-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-on: http://openocd.zylin.com/5316
Reviewed-by: Tomas Vanek <va...@fb...>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/board/st_nucleo_h745zi.cfg b/tcl/board/st_nucleo_h745zi.cfg
index bb8a396b5..22d36f686 100644
--- a/tcl/board/st_nucleo_h745zi.cfg
+++ b/tcl/board/st_nucleo_h745zi.cfg
@@ -1,16 +1,14 @@
# This is an ST NUCLEO-H745ZI-Q board with single STM32H745ZITx chip.
-source [find interface/stlink.cfg]
-transport select hla_swd
+source [find interface/stlink-dap.cfg]
+transport select dapdirect_swd
-# ST-Link HLA interface do not support multi-AP debugging
-# then setting DUAL_CORE and USE_CTI has no effect, because
-# it will fall back to single core configuration
+# STM32H745xx devices are dual core (Cortex-M7 and Cortex-M4)
set DUAL_CORE 1
+
+# enable CTI for cross halting both cores
set USE_CTI 1
source [find target/stm32h7x_dual_bank.cfg]
-# when using ST-Link HLA adapter, DBGMCU accesses are done via AP0
-# unfortunately DBGMCU is not accessible when SRST is asserted
reset_config srst_only
-----------------------------------------------------------------------
Summary of changes:
tcl/board/st_nucleo_h745zi.cfg | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 21:37:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 35f846fd52e27fabcdea383a6be5056a9213c939 (commit)
from 1ef468edc50e83261e1ab8a104716cdaa9e84945 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 35f846fd52e27fabcdea383a6be5056a9213c939
Author: Tomas Vanek <va...@fb...>
Date: Fri Dec 20 23:41:55 2019 +0100
target/adi_v5_swd: fix clang static analyzer warning
Change-Id: I24b3e74b62fad469e3150ad97a10a9ab69c2793b
Signed-off-by: Tomas Vanek <va...@fb...>
Reviewed-on: http://openocd.zylin.com/5374
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-by: Oleksij Rempel <li...@re...>
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 8d1153733..ee30ff7ba 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -96,7 +96,7 @@ static int swd_run_inner(struct adiv5_dap *dap)
static int swd_connect(struct adiv5_dap *dap)
{
const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
- uint32_t dpidr;
+ uint32_t dpidr = 0xdeadbeef;
int status;
/* FIXME validate transport config ... is the
-----------------------------------------------------------------------
Summary of changes:
src/target/adi_v5_swd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 21:34:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 1ef468edc50e83261e1ab8a104716cdaa9e84945 (commit)
from 61ef89ce4b06f957ac0bd5cdb1c26ab8b64bc097 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1ef468edc50e83261e1ab8a104716cdaa9e84945
Author: Tarek BOCHKATI <tar...@gm...>
Date: Fri Feb 7 18:36:29 2020 +0100
flash/nor/tcl.c: add filld command to write double-word with 64-bit value
Change-Id: I2eeda7af7d855ed1284083d025994f8fa9531969
Signed-off-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-on: http://openocd.zylin.com/5443
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index cdec3b0f5..de7dceb78 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -5074,10 +5074,11 @@ If @option{unlock} is specified, then the flash is unprotected
before erase starts.
@end deffn
-@deffn Command {flash fillw} address word length
+@deffn Command {flash filld} address double-word length
+@deffnx Command {flash fillw} address word length
@deffnx Command {flash fillh} address halfword length
@deffnx Command {flash fillb} address byte length
-Fills flash memory with the specified @var{word} (32 bits),
+Fills flash memory with the specified @var{double-word} (64 bits), @var{word} (32 bits),
@var{halfword} (16 bits), or @var{byte} (8-bit) pattern,
starting at @var{address} and continuing
for @var{length} units (word/halfword/byte).
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index bd313a0b5..3287dd97f 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -476,7 +476,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
COMMAND_HANDLER(handle_flash_fill_command)
{
target_addr_t address;
- uint32_t pattern;
+ uint64_t pattern;
uint32_t count;
struct target *target = get_current_target(CMD_CTX);
unsigned i;
@@ -487,7 +487,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
return ERROR_COMMAND_SYNTAX_ERROR;
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
- COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
+ COMMAND_PARSE_NUMBER(u64, CMD_ARGV[1], pattern);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
struct flash_bank *bank;
@@ -496,6 +496,9 @@ COMMAND_HANDLER(handle_flash_fill_command)
return retval;
switch (CMD_NAME[4]) {
+ case 'd':
+ wordsize = 8;
+ break;
case 'w':
wordsize = 4;
break;
@@ -541,6 +544,10 @@ COMMAND_HANDLER(handle_flash_fill_command)
uint8_t *ptr = buffer + padding_at_start;
switch (wordsize) {
+ case 8:
+ for (i = 0; i < count; i++, ptr += wordsize)
+ target_buffer_set_u64(target, ptr, pattern);
+ break;
case 4:
for (i = 0; i < count; i++, ptr += wordsize)
target_buffer_set_u32(target, ptr, pattern);
@@ -577,9 +584,12 @@ COMMAND_HANDLER(handle_flash_fill_command)
goto done;
for (i = 0, ptr = buffer; i < count; i++) {
- uint32_t readback = 0;
+ uint64_t readback = 0;
switch (wordsize) {
+ case 8:
+ readback = target_buffer_get_u64(target, ptr);
+ break;
case 4:
readback = target_buffer_get_u32(target, ptr);
break;
@@ -593,7 +603,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
if (readback != pattern) {
LOG_ERROR(
"Verification error address " TARGET_ADDR_FMT
- ", read back 0x%02" PRIx32 ", expected 0x%02" PRIx32,
+ ", read back 0x%02" PRIx64 ", expected 0x%02" PRIx64,
address + i * wordsize, readback, pattern);
retval = ERROR_FAIL;
goto done;
@@ -1002,6 +1012,14 @@ static const struct command_registration flash_exec_command_handlers[] = {
"before erasing.",
},
+ {
+ .name = "filld",
+ .handler = handle_flash_fill_command,
+ .mode = COMMAND_EXEC,
+ .usage = "address value n",
+ .help = "Fill n double-words with 64-bit value, starting at "
+ "word address. (No autoerase.)",
+ },
{
.name = "fillw",
.handler = handle_flash_fill_command,
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 5 +++--
src/flash/nor/tcl.c | 26 ++++++++++++++++++++++----
2 files changed, 25 insertions(+), 6 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 21:34:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 61ef89ce4b06f957ac0bd5cdb1c26ab8b64bc097 (commit)
from da181fc3ecda55e73544c8c4fb86e3e82d2dc0c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 61ef89ce4b06f957ac0bd5cdb1c26ab8b64bc097
Author: Tomas Vanek <va...@fb...>
Date: Sat Dec 14 19:37:41 2019 +0100
flash/nor/stm32l4x: lock flash after error
Also add locking after option write, it was missing at all.
Change-Id: I0227c6a74866f0fe8e40aa58616f0b3115ad5af0
Signed-off-by: Tomas Vanek <va...@fb...>
Reviewed-on: http://openocd.zylin.com/5361
Tested-by: jenkins
Reviewed-by: Andreas Bolsch <hyp...@gm...>
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index c8055cd9c..e9fb77e03 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -412,34 +412,39 @@ static int stm32l4_unlock_option_reg(struct flash_bank *bank)
static int stm32l4_write_option(struct flash_bank *bank, uint32_t reg_offset, uint32_t value, uint32_t mask)
{
uint32_t optiondata;
+ int retval, retval2;
- int retval = stm32l4_read_flash_reg(bank, reg_offset, &optiondata);
+ retval = stm32l4_read_flash_reg(bank, reg_offset, &optiondata);
if (retval != ERROR_OK)
return retval;
retval = stm32l4_unlock_reg(bank);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_unlock_option_reg(bank);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
optiondata = (optiondata & ~mask) | (value & mask);
retval = stm32l4_write_flash_reg(bank, reg_offset, optiondata);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_OPTSTRT);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
+
+err_lock:
+ retval2 = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK | FLASH_OPTLOCK);
+
if (retval != ERROR_OK)
return retval;
- return retval;
+ return retval2;
}
static int stm32l4_protect_check(struct flash_bank *bank)
@@ -489,7 +494,7 @@ static int stm32l4_erase(struct flash_bank *bank, int first, int last)
{
struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
int i;
- int retval;
+ int retval, retval2;
assert(first < bank->num_sectors);
assert(last < bank->num_sectors);
@@ -501,7 +506,7 @@ static int stm32l4_erase(struct flash_bank *bank, int first, int last)
retval = stm32l4_unlock_reg(bank);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
/*
Sector Erase
@@ -526,20 +531,22 @@ static int stm32l4_erase(struct flash_bank *bank, int first, int last)
erase_flags |= i << FLASH_PAGE_SHIFT;
retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, erase_flags);
if (retval != ERROR_OK)
- return retval;
+ break;
retval = stm32l4_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
if (retval != ERROR_OK)
- return retval;
+ break;
bank->sectors[i].is_erased = 1;
}
- retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK);
+err_lock:
+ retval2 = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK);
+
if (retval != ERROR_OK)
return retval;
- return ERROR_OK;
+ return retval2;
}
static int stm32l4_protect(struct flash_bank *bank, int set, int first, int last)
@@ -690,10 +697,11 @@ static int stm32l4_write(struct flash_bank *bank, const uint8_t *buffer,
retval = stm32l4_unlock_reg(bank);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_write_block(bank, buffer, offset, count / 8);
+err_lock:
retval2 = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK);
if (retval != ERROR_OK) {
@@ -924,7 +932,7 @@ static int get_stm32l4_info(struct flash_bank *bank, char *buf, int buf_size)
static int stm32l4_mass_erase(struct flash_bank *bank)
{
- int retval;
+ int retval, retval2;
struct target *target = bank->target;
struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
@@ -940,29 +948,30 @@ static int stm32l4_mass_erase(struct flash_bank *bank)
retval = stm32l4_unlock_reg(bank);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
/* mass erase flash memory */
retval = stm32l4_wait_status_busy(bank, FLASH_ERASE_TIMEOUT / 10);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, action);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
+
retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, action | FLASH_STRT);
if (retval != ERROR_OK)
- return retval;
+ goto err_lock;
retval = stm32l4_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
- if (retval != ERROR_OK)
- return retval;
- retval = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK);
+err_lock:
+ retval2 = stm32l4_write_flash_reg(bank, STM32_FLASH_CR, FLASH_LOCK);
+
if (retval != ERROR_OK)
return retval;
- return ERROR_OK;
+ return retval2;
}
COMMAND_HANDLER(stm32l4_handle_mass_erase_command)
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32l4x.c | 53 ++++++++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 22 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 21:33:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via da181fc3ecda55e73544c8c4fb86e3e82d2dc0c9 (commit)
via 46176304562951ec41b6c257124d88c6707f4c3d (commit)
from a6dacdff58ef36fcdac00c53ec27f19de1fbce0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit da181fc3ecda55e73544c8c4fb86e3e82d2dc0c9
Author: Leonard Crestez <leo...@nx...>
Date: Sat Feb 1 02:02:04 2020 +0200
tcl/board: Add imx8mp-evk
Board includes an internal adapter (interface/ftdi/imx8mp-evk.cfg) and a
standard external ARM-10 connector.
Change-Id: Ibb301011665b1edfb95be1213d8100143f6839dd
Signed-off-by: Leonard Crestez <leo...@nx...>
Reviewed-on: http://openocd.zylin.com/5427
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/tcl/board/imx8mp-evk.cfg b/tcl/board/imx8mp-evk.cfg
new file mode 100644
index 000000000..97a303ac7
--- /dev/null
+++ b/tcl/board/imx8mp-evk.cfg
@@ -0,0 +1,15 @@
+#
+# configuration file for NXP MC-IMX8MP-EVK
+#
+# Board includes FTDI-based JTAG adapter: interface/ftdi/imx8mp-evk.cfg
+#
+
+transport select jtag
+adapter speed 1000
+reset_config srst_only
+adapter srst delay 100
+
+set CHIPNAME imx8mp
+set CHIPCORES 4
+
+source [find target/imx8m.cfg]
commit 46176304562951ec41b6c257124d88c6707f4c3d
Author: Leonard Crestez <leo...@nx...>
Date: Sat Feb 1 01:53:35 2020 +0200
tcl/interface/ftdi: Add imx8mp-evk internal JTAG interface
The imx8mp-evk board has a FT4232H chip connected to the chip's JTAG
pins.
Switching between this on-board interface and the external ARM-10
connector is controlled by an GPIO which is behind an i2c expander
connected to the same FTDI chip.
Switching can be performed using the NXP bcu tool:
https://github.com/NXPmicro/bcu
Change-Id: Ic910515f76eaf09ea6d0f755b026fb09cf09ccfc
Signed-off-by: Leonard Crestez <leo...@nx...>
Reviewed-on: http://openocd.zylin.com/5426
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/tcl/interface/ftdi/imx8mp-evk.cfg b/tcl/interface/ftdi/imx8mp-evk.cfg
new file mode 100644
index 000000000..4e04e8cd7
--- /dev/null
+++ b/tcl/interface/ftdi/imx8mp-evk.cfg
@@ -0,0 +1,28 @@
+#
+# Configuration file for NXP MC-IMX8MP-EVK on-board internal JTAG
+#
+# Using this interface requires enabling "remote mode" for the board using the
+# NXP bcu tool (see https://github.com/NXPmicro/bcu)
+#
+# bcu set_gpio remote_en 1 -board=imx8mpevk
+#
+# The REMOTE_EN gpio is accessible through the same FTDI adapter but it's
+# behind an I2C GPIO expander.
+#
+
+adapter driver ftdi
+ftdi_vid_pid 0x0403 0x6011
+ftdi_channel 0
+
+ftdi_layout_init 0x00f8 0x000b
+
+ftdi_layout_signal RESET_B -data 0x0010 -oe 0x0010
+# Called SYS_nRST in schematics
+ftdi_layout_signal nSRST -data 0x0020 -oe 0x0020
+ftdi_layout_signal IO_nRST -data 0x0040 -oe 0x0040
+ftdi_layout_signal ONOFF_B -data 0x0080 -oe 0x0080
+
+ftdi_layout_signal GPIO1 -data 0x0100 -oe 0x0100
+ftdi_layout_signal GPIO2 -data 0x0200 -oe 0x0200
+ftdi_layout_signal GPIO3 -data 0x0400 -oe 0x0400
+ftdi_layout_signal GPIO4 -data 0x0800 -oe 0x0800
-----------------------------------------------------------------------
Summary of changes:
tcl/board/imx8mp-evk.cfg | 15 +++++++++++++++
tcl/interface/ftdi/imx8mp-evk.cfg | 28 ++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 tcl/board/imx8mp-evk.cfg
create mode 100644 tcl/interface/ftdi/imx8mp-evk.cfg
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 12:39:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via a6dacdff58ef36fcdac00c53ec27f19de1fbce0d (commit)
from 2a60ae7fee192db54240e5929d6434c0eb3e190d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a6dacdff58ef36fcdac00c53ec27f19de1fbce0d
Author: Christopher Head <ch...@za...>
Date: Fri Jan 3 14:49:16 2020 -0800
flash/stm32h7x: use alignment infrastructure
Report the 32-byte alignemnt requirement via the bank structure rather
than enforcing it ad-hoc in the write routine. This allows people to do
non-32-byte-aligned writes if they want, with the infrastructure fixing
up the addresses passed to the low-level driver.
Change-Id: I2c4f532f2000435954a900224dbc9f2c30d1cc94
Signed-off-by: Christopher Head <ch...@za...>
Reviewed-on: http://openocd.zylin.com/5388
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index 152a154bd..bf003684c 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -170,6 +170,9 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info->probed = 0;
stm32x_info->user_bank_size = bank->size;
+ bank->write_start_alignment = FLASH_BLOCK_SIZE;
+ bank->write_end_alignment = FLASH_BLOCK_SIZE;
+
return ERROR_OK;
}
@@ -610,17 +613,17 @@ static int stm32x_write(struct flash_bank *bank, const uint8_t *buffer,
return ERROR_TARGET_NOT_HALTED;
}
- if (offset % FLASH_BLOCK_SIZE) {
- LOG_WARNING("offset 0x%" PRIx32 " breaks required 32-byte alignment", offset);
- return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
- }
+ /* should be enforced via bank->write_start_alignment */
+ assert(!(offset % FLASH_BLOCK_SIZE));
+
+ /* should be enforced via bank->write_end_alignment */
+ assert(!(count % FLASH_BLOCK_SIZE));
retval = stm32x_unlock_reg(bank);
if (retval != ERROR_OK)
goto flash_lock;
uint32_t blocks_remaining = count / FLASH_BLOCK_SIZE;
- uint32_t bytes_remaining = count % FLASH_BLOCK_SIZE;
/* multiple words (32-bytes) to be programmed in block */
if (blocks_remaining) {
@@ -667,25 +670,6 @@ static int stm32x_write(struct flash_bank *bank, const uint8_t *buffer,
blocks_remaining--;
}
- if (bytes_remaining) {
- retval = stm32x_write_flash_reg(bank, FLASH_CR, FLASH_PG | FLASH_PSIZE_64);
- if (retval != ERROR_OK)
- goto flash_lock;
-
- retval = target_write_buffer(target, address, bytes_remaining, buffer);
- if (retval != ERROR_OK)
- goto flash_lock;
-
- /* Force Write buffer of FLASH_BLOCK_SIZE = 32 bytes */
- retval = stm32x_write_flash_reg(bank, FLASH_CR, FLASH_PG | FLASH_PSIZE_64 | FLASH_FW);
- if (retval != ERROR_OK)
- goto flash_lock;
-
- retval = stm32x_wait_flash_op_queue(bank, FLASH_WRITE_TIMEOUT);
- if (retval != ERROR_OK)
- goto flash_lock;
- }
-
flash_lock:
retval2 = stm32x_lock_reg(bank);
if (retval2 != ERROR_OK)
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32h7x.c | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 12:29:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 2a60ae7fee192db54240e5929d6434c0eb3e190d (commit)
from a08d7b7093a89ac54e673f0a4da0c2712e375891 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2a60ae7fee192db54240e5929d6434c0eb3e190d
Author: Marc Schink <de...@za...>
Date: Sun Jan 19 16:56:16 2020 +0100
flash/nor/stm32f1x: Some small code cleanups
Change-Id: I1fc08b96b179a1376af233b713ae50d6ad7867a0
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/5404
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <and...@gm...>
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 91fd541f6..ba0d54e79 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -116,7 +116,7 @@ struct stm32x_options {
struct stm32x_flash_bank {
struct stm32x_options option_bytes;
int ppage_size;
- int probed;
+ bool probed;
bool has_dual_banks;
/* used to access dual flash bank stm32xl */
@@ -145,7 +145,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
bank->driver_priv = stm32x_info;
- stm32x_info->probed = 0;
+ stm32x_info->probed = false;
stm32x_info->has_dual_banks = false;
stm32x_info->can_load_options = false;
stm32x_info->register_base = FLASH_REG_BASE_B0;
@@ -368,7 +368,6 @@ static int stm32x_protect_check(struct flash_bank *bank)
static int stm32x_erase(struct flash_bank *bank, int first, int last)
{
struct target *target = bank->target;
- int i;
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
@@ -386,7 +385,7 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
if (retval != ERROR_OK)
return retval;
- for (i = first; i <= last; i++) {
+ for (int i = first; i <= last; i++) {
retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_PER);
if (retval != ERROR_OK)
return retval;
@@ -697,7 +696,7 @@ static int stm32x_probe(struct flash_bank *bank)
int page_size;
uint32_t base_address = 0x08000000;
- stm32x_info->probed = 0;
+ stm32x_info->probed = false;
stm32x_info->register_base = FLASH_REG_BASE_B0;
stm32x_info->user_data_offset = 10;
stm32x_info->option_offset = 0;
@@ -886,7 +885,7 @@ static int stm32x_probe(struct flash_bank *bank)
if (num_prot_blocks == 32)
bank->prot_blocks[31].size = (num_pages - (31 * stm32x_info->ppage_size)) * page_size;
- stm32x_info->probed = 1;
+ stm32x_info->probed = true;
return ERROR_OK;
}
@@ -1474,8 +1473,6 @@ static int stm32x_mass_erase(struct flash_bank *bank)
COMMAND_HANDLER(stm32x_handle_mass_erase_command)
{
- int i;
-
if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1487,7 +1484,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
retval = stm32x_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
- for (i = 0; i < bank->num_sectors; i++)
+ for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1;
command_print(CMD, "stm32x mass erase complete");
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32f1x.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 12:28:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via a08d7b7093a89ac54e673f0a4da0c2712e375891 (commit)
from f1f1f3fe1f2c2ba604205e7163d01b3481e4e96b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a08d7b7093a89ac54e673f0a4da0c2712e375891
Author: Christopher Head <ch...@za...>
Date: Mon Jan 27 14:48:15 2020 -0800
flash/nor/stm32h7x: check OPTCHANGEERR
Without this, a failed attempt to change option bytes will silently
appear to succeed but without actually changing the option bytes
(confusingly, the option bytes will still read back as if they had been
changed until a reboot as well!).
Change-Id: Id529c6c384a8a16be75f5702310670d99d8fac79
Signed-off-by: Christopher Head <ch...@za...>
Reviewed-on: http://openocd.zylin.com/5418
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <and...@gm...>
diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index 7ce369be3..152a154bd 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -83,6 +83,7 @@
#define OPT_BSY (1 << 0)
#define OPT_RDP_POS 8
#define OPT_RDP_MASK (0xff << OPT_RDP_POS)
+#define OPT_OPTCHANGEERR (1 << 30)
/* FLASH_OPTCCR register bits */
#define OPT_CLR_OPTCHANGEERR (1 << 30)
@@ -343,8 +344,8 @@ static int stm32x_write_option(struct flash_bank *bank, uint32_t reg_offset, uin
/* wait for completion */
int timeout = FLASH_ERASE_TIMEOUT;
+ uint32_t status;
for (;;) {
- uint32_t status;
retval = stm32x_read_flash_reg(bank, FLASH_OPTSR_CUR, &status);
if (retval != ERROR_OK) {
LOG_ERROR("stm32x_options_program: failed to read FLASH_OPTSR_CUR");
@@ -361,6 +362,12 @@ static int stm32x_write_option(struct flash_bank *bank, uint32_t reg_offset, uin
alive_sleep(1);
}
+ /* check for failure */
+ if (status & OPT_OPTCHANGEERR) {
+ LOG_ERROR("error changing option bytes (OPTCHANGEERR=1)");
+ retval = ERROR_FLASH_OPERATION_FAILED;
+ }
+
flash_options_lock:
retval2 = stm32x_lock_option_reg(bank);
if (retval2 != ERROR_OK)
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32h7x.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-23 12:27:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via f1f1f3fe1f2c2ba604205e7163d01b3481e4e96b (commit)
from ee56c502607760deb1b44b4ab06b1cb3a59029fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f1f1f3fe1f2c2ba604205e7163d01b3481e4e96b
Author: Christopher Head <ch...@za...>
Date: Mon Jan 27 13:30:04 2020 -0800
flash/nor/stm32h7x: fix incorrect array indexing
Change-Id: Iec2246df284953d1442dfefdad8e70041690dfe2
Signed-off-by: Christopher Head <ch...@za...>
Reviewed-on: http://openocd.zylin.com/5417
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-by: Andreas Fritiofson <and...@gm...>
diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index 008572915..7ce369be3 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -1057,7 +1057,7 @@ COMMAND_HANDLER(stm32x_handle_option_write_command)
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], reg_offset);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], value);
if (CMD_ARGC > 3)
- COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], mask);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], mask);
return stm32x_modify_option(bank, reg_offset, value, mask);
}
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32h7x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:40:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via ee56c502607760deb1b44b4ab06b1cb3a59029fe (commit)
from 54814015148345c01c8878893daed7b429d2793c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee56c502607760deb1b44b4ab06b1cb3a59029fe
Author: Antonio Borneo <bor...@gm...>
Date: Thu Jul 18 15:14:34 2019 +0200
stlink: add trace support in DAP direct mode
Reuse the existing tracing functionality of HLA mode to support
tracing in DAP direct mode.
Change-Id: I75a01e88ba5d3e45717e4108b99697ac3225db9e
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5409
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <li...@re...>
diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index dc2fe8c5a..da1d1b564 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -3462,6 +3462,21 @@ static void stlink_dap_op_quit(struct adiv5_dap *dap)
LOG_ERROR("Error closing APs");
}
+static int stlink_dap_config_trace(bool enabled,
+ enum tpiu_pin_protocol pin_protocol, uint32_t port_size,
+ unsigned int *trace_freq, unsigned int traceclkin_freq,
+ uint16_t *prescaler)
+{
+ return stlink_config_trace(stlink_dap_handle, enabled, pin_protocol,
+ port_size, trace_freq, traceclkin_freq,
+ prescaler);
+}
+
+static int stlink_dap_trace_read(uint8_t *buf, size_t *size)
+{
+ return stlink_usb_trace_read(stlink_dap_handle, buf, size);
+}
+
/** */
COMMAND_HANDLER(stlink_dap_serial_command)
{
@@ -3645,6 +3660,8 @@ struct adapter_driver stlink_dap_adapter_driver = {
.speed = stlink_dap_speed,
.khz = stlink_dap_khz,
.speed_div = stlink_dap_speed_div,
+ .config_trace = stlink_dap_config_trace,
+ .poll_trace = stlink_dap_trace_read,
.dap_jtag_ops = &stlink_dap_ops,
.dap_swd_ops = &stlink_dap_ops,
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/stlink_usb.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:39:23
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 54814015148345c01c8878893daed7b429d2793c (commit)
from 1492a103db6174bd4d6994ea3487c096aef4560d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54814015148345c01c8878893daed7b429d2793c
Author: Antonio Borneo <bor...@gm...>
Date: Fri Jun 14 15:59:17 2019 +0200
armv8: check the core state to pass the correct arch to gdb
Commit 3799eded6761 ("target/aarch64: add support for
multi-architecture gdb") passes the constant string "aarch64" as
architecture to gdb. This is not working if the core is running
in 32 bits mode; gdb reports:
Truncated register 8 in remote 'g' packet
then closes the connection with OpenOCD.
Make the architecture string dependant from the current state of
the core.
Change-Id: I16e1614ea02ba29bf87f450b3dfe25c83c9a3612
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5234
Tested-by: jenkins
Reviewed-by: Muhammad Omair Javaid <oma...@li...>
diff --git a/src/target/armv8.c b/src/target/armv8.c
index e7369372a..88b932073 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1753,7 +1753,8 @@ const struct command_registration armv8_command_handlers[] = {
const char *armv8_get_gdb_arch(struct target *target)
{
- return "aarch64";
+ struct arm *arm = target_to_arm(target);
+ return arm->core_state == ARM_STATE_AARCH64 ? "aarch64" : "arm";
}
int armv8_get_gdb_reg_list(struct target *target,
-----------------------------------------------------------------------
Summary of changes:
src/target/armv8.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:38:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 1492a103db6174bd4d6994ea3487c096aef4560d (commit)
via 8105c46ba5d219345cc554fd958a65f4e26ae9ce (commit)
from def7318edd6570fb5484d2a4ee19b7ac1fa39f53 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1492a103db6174bd4d6994ea3487c096aef4560d
Author: Antonio Borneo <bor...@gm...>
Date: Mon May 6 12:50:44 2019 +0200
coding style: use ARRAY_SIZE() when possible
We have the macro ARRAY_SIZE() already available. Use it!
Issue identified by checkpatch script from Linux kernel v5.1 using
the command
find src/ -type f -exec ./tools/scripts/checkpatch.pl \
-q --types ARRAY_SIZE -f {} \;
Change-Id: Ic7da9b710edf118eacb08f9e222f34208c580842
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5198
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/flash/nor/ambiqmicro.c b/src/flash/nor/ambiqmicro.c
index b1e3e72a9..b41b15c07 100644
--- a/src/flash/nor/ambiqmicro.c
+++ b/src/flash/nor/ambiqmicro.c
@@ -253,8 +253,7 @@ static int ambiqmicro_read_part_info(struct flash_bank *bank)
}
- if (ambiqmicro_info->target_class <
- (sizeof(ambiqmicroParts)/sizeof(ambiqmicroParts[0])))
+ if (ambiqmicro_info->target_class < ARRAY_SIZE(ambiqmicroParts))
ambiqmicro_info->target_name =
ambiqmicroParts[ambiqmicro_info->target_class].partname;
else
diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
index c62af04bf..9e18136fa 100644
--- a/src/flash/nor/numicro.c
+++ b/src/flash/nor/numicro.c
@@ -1663,7 +1663,7 @@ static int numicro_get_cpu_type(struct target *target, const struct numicro_cpu_
LOG_INFO("Device ID: 0x%08" PRIx32 "", part_id);
/* search part numbers */
- for (size_t i = 0; i < sizeof(NuMicroParts)/sizeof(NuMicroParts[0]); i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(NuMicroParts); i++) {
if (part_id == NuMicroParts[i].partid) {
*cpu = &NuMicroParts[i];
LOG_INFO("Device Name: %s", (*cpu)->partname);
diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index 386075e2c..3cdfcc424 100644
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -108,7 +108,7 @@ static const struct row_region safe_sflash_regions[] = {
{0x16007C00, 0x400}, /* SFLASH: TOC2 */
};
-#define SFLASH_NUM_REGIONS (sizeof(safe_sflash_regions) / sizeof(safe_sflash_regions[0]))
+#define SFLASH_NUM_REGIONS ARRAY_SIZE(safe_sflash_regions)
static struct working_area *g_stack_area;
static struct armv7m_algorithm g_armv7m_info;
diff --git a/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c b/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
index 53a7e989b..678b097c9 100644
--- a/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
+++ b/src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
@@ -48,7 +48,7 @@ uint8_t usbtoxxx_abilities[USB_TO_XXX_ABILITIES_LEN];
#define usbtoxxx_get_type_name(type) \
types_name[((type) - VERSALOON_USB_TO_XXX_CMD_START) \
- % (sizeof(types_name) / sizeof(types_name[0]))]
+ % ARRAY_SIZE(types_name)]
static uint8_t type_pre;
static uint16_t usbtoxxx_buffer_index;
commit 8105c46ba5d219345cc554fd958a65f4e26ae9ce
Author: Antonio Borneo <bor...@gm...>
Date: Mon May 6 11:29:17 2019 +0200
coding style: remove unnecessary parentheses
Identified by checkpatch script from Linux kernel v5.1 using the
command
find src/ -type f -exec ./tools/scripts/checkpatch.pl \
-q --types UNNECESSARY_PARENTHESES -f {} \;
then fixed manually.
Change-Id: Ia2d9a0953d9b89fc87dc1195aa05c7f63c068c48
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5196
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 7f59401b1..9a1f2b16f 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -919,7 +919,7 @@ static int cortex_m_step(struct target *target, int current,
* a normal step, otherwise we have to manually step over the bkpt
* instruction - as such simulate a step */
if (bkpt_inst_found == false) {
- if ((cortex_m->isrmasking_mode != CORTEX_M_ISRMASK_AUTO)) {
+ if (cortex_m->isrmasking_mode != CORTEX_M_ISRMASK_AUTO) {
/* Automatic ISR masking mode off: Just step over the next
* instruction, with interrupts on or off as appropriate. */
cortex_m_set_maskints_for_step(target);
diff --git a/src/target/stm8.c b/src/target/stm8.c
index 54a4bce26..6b03bb5a4 100644
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -356,7 +356,7 @@ static int stm8_set_hwbreak(struct target *target,
if ((comparator_list[0].type != HWBRK_EXEC)
&& (comparator_list[1].type != HWBRK_EXEC)) {
- if ((comparator_list[0].type != comparator_list[1].type)) {
+ if (comparator_list[0].type != comparator_list[1].type) {
LOG_ERROR("data hw breakpoints must be of same type");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/ambiqmicro.c | 3 +--
src/flash/nor/numicro.c | 2 +-
src/flash/nor/psoc6.c | 2 +-
src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c | 2 +-
src/target/cortex_m.c | 2 +-
src/target/stm8.c | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:37:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via def7318edd6570fb5484d2a4ee19b7ac1fa39f53 (commit)
via b5c883f298ebd7d459e8247531e6ca3b6dda45cd (commit)
from 9cf7dff97481fc8f698cdedb821be0fde7d6c80a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit def7318edd6570fb5484d2a4ee19b7ac1fa39f53
Author: Antonio Borneo <bor...@gm...>
Date: Mon May 6 15:15:54 2019 +0200
jtag/startup.tcl: remove trailing whitespaces
Change-Id: I1d6f4f47ee6f8985c84ddb2647e029c5f4e6a55a
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5194
Tested-by: jenkins
Reviewed-by: Marc Schink <de...@za...>
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index e522e74d6..8fc3ad5ef 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -34,16 +34,16 @@ proc init_reset { mode } {
proc power_restore {} {
echo "Sensed power restore, running reset init and halting GDB."
reset init
-
+
# Halt GDB so user can deal with a detected power restore.
#
# After GDB is halted, then output is no longer forwarded
# to the GDB console.
- set targets [target names]
+ set targets [target names]
foreach t $targets {
# New event script.
$t invoke-event arp_halt_gdb
- }
+ }
}
add_help_text power_restore "Overridable procedure run when power restore is detected. Runs 'reset init' by default."
@@ -65,11 +65,11 @@ proc srst_deasserted {} {
#
# After GDB is halted, then output is no longer forwarded
# to the GDB console.
- set targets [target names]
+ set targets [target names]
foreach t $targets {
# New event script.
$t invoke-event arp_halt_gdb
- }
+ }
}
add_help_text srst_deasserted "Overridable procedure run when srst deassert is detected. Runs 'reset init' by default."
commit b5c883f298ebd7d459e8247531e6ca3b6dda45cd
Author: Antonio Borneo <bor...@gm...>
Date: Mon May 6 11:40:17 2019 +0200
target/nds32: fix type of magic number
The macro NDS32_COMMON_MAGIC was cast-ed to int to avoid compile
time error for comparison type mismatch while comparing it with
the field common_magic.
This is incorrect because the macro value is a 32 bit unsigned
value; better changing the type of the field common_magic to keep
the unsigned value.
Issue identified by checkpatch script from Linux kernel v5.1 using
the command
find src/ -type f -exec ./tools/scripts/checkpatch.pl \
-q --types TYPECAST_INT_CONSTANT -f {} \;
Change-Id: Ib5924b6cecdffe70ab5c78d3b30a9c8e4deb7c7b
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/5193
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/target/nds32.h b/src/target/nds32.h
index 141dbf4cb..3670fd289 100644
--- a/src/target/nds32.h
+++ b/src/target/nds32.h
@@ -82,7 +82,7 @@ enum nds32_syscall_id {
NDS32_SYSCALL_ERRNO = 6001,
};
-#define NDS32_COMMON_MAGIC (int)0xADE5ADE5
+#define NDS32_COMMON_MAGIC 0xADE5ADE5U
struct nds32_edm {
@@ -235,7 +235,7 @@ struct nds32_misc_config {
* Represents a generic Andes core.
*/
struct nds32 {
- int common_magic;
+ uint32_t common_magic;
struct reg_cache *core_cache;
/** Handle for the debug module. */
-----------------------------------------------------------------------
Summary of changes:
src/jtag/startup.tcl | 10 +++++-----
src/target/nds32.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:34:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 9cf7dff97481fc8f698cdedb821be0fde7d6c80a (commit)
from 4882acef80d179628e31ee94e931f8fc2ac2698e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9cf7dff97481fc8f698cdedb821be0fde7d6c80a
Author: Marc Schink <de...@za...>
Date: Thu Feb 6 11:02:25 2020 +0100
flash/nor/stm32lx: Minor code cleanups
Change-Id: I6440a4eb1f65a2f8ae2914b38f21a59955e85e0d
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/5438
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index f112f88f1..c3f9c7249 100644
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -128,7 +128,7 @@ struct stm32lx_part_info {
};
struct stm32lx_flash_bank {
- int probed;
+ bool probed;
uint32_t idcode;
uint32_t user_bank_size;
uint32_t flash_base;
@@ -297,7 +297,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
bank->driver_priv = stm32lx_info;
- stm32lx_info->probed = 0;
+ stm32lx_info->probed = false;
stm32lx_info->user_bank_size = bank->size;
/* the stm32l erased value is 0x00 */
@@ -308,8 +308,6 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
COMMAND_HANDLER(stm32lx_handle_mass_erase_command)
{
- int i;
-
if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -321,7 +319,7 @@ COMMAND_HANDLER(stm32lx_handle_mass_erase_command)
retval = stm32lx_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
- for (i = 0; i < bank->num_sectors; i++)
+ for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1;
command_print(CMD, "stm32lx mass erase complete");
@@ -731,14 +729,13 @@ static int stm32lx_probe(struct flash_bank *bank)
{
struct target *target = bank->target;
struct stm32lx_flash_bank *stm32lx_info = bank->driver_priv;
- int i;
uint16_t flash_size_in_kb;
uint32_t device_id;
uint32_t base_address = FLASH_BANK0_ADDRESS;
uint32_t second_bank_base;
unsigned int n;
- stm32lx_info->probed = 0;
+ stm32lx_info->probed = false;
int retval = stm32lx_read_id_code(bank->target, &device_id);
if (retval != ERROR_OK)
@@ -852,14 +849,14 @@ static int stm32lx_probe(struct flash_bank *bank)
return ERROR_FAIL;
}
- for (i = 0; i < num_sectors; i++) {
+ for (int i = 0; i < num_sectors; i++) {
bank->sectors[i].offset = i * FLASH_SECTOR_SIZE;
bank->sectors[i].size = FLASH_SECTOR_SIZE;
bank->sectors[i].is_erased = -1;
bank->sectors[i].is_protected = -1;
}
- stm32lx_info->probed = 1;
+ stm32lx_info->probed = true;
return ERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
src/flash/nor/stm32lx.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:33:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 4882acef80d179628e31ee94e931f8fc2ac2698e (commit)
from e8c747048fed28edf1900df56e8ffd5ba77b221e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4882acef80d179628e31ee94e931f8fc2ac2698e
Author: Jan Matyas <ma...@co...>
Date: Wed Jan 22 08:50:36 2020 +0100
jtag_vpi: added an option to stop simulation on exit
Command CMD_STOP_SIMU had been defined in jtag_vpi for a long time
(since the beginning?) but has not been utilized until now.
Its purpose is to signal to the jtag_vpi server (i.e. the RTL
simulation software) that the simulation shall be stopped.
This commit adds a TCL configuration command that selects whether
CMD_STOP_SIMU will be sent to the jtag_vpi server when OpenOCD is
about to exit. This functionality is off by default to maintain
identical behavior as in previous OpenOCD versions, unless the user
enables it explicitly.
Change-Id: If3894af6efa61038ccf6c9191f664e2128f2ef11
Signed-off-by: Jan Matyas <ma...@co...>
Reviewed-on: http://openocd.zylin.com/5407
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <li...@re...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/drivers/jtag_vpi.c b/src/jtag/drivers/jtag_vpi.c
index e5124b5b0..a5a95a5a3 100644
--- a/src/jtag/drivers/jtag_vpi.c
+++ b/src/jtag/drivers/jtag_vpi.c
@@ -49,11 +49,15 @@
#define CMD_SCAN_CHAIN_FLIP_TMS 3
#define CMD_STOP_SIMU 4
-int server_port = SERVER_PORT;
-char *server_address;
+/* jtag_vpi server port and address to connect to */
+static int server_port = SERVER_PORT;
+static char *server_address;
-int sockfd;
-struct sockaddr_in serv_addr;
+/* Send CMD_STOP_SIMU to server when OpenOCD exits? */
+static bool stop_sim_on_exit;
+
+static int sockfd;
+static struct sockaddr_in serv_addr;
/* One jtag_vpi "packet" as sent over a TCP channel. */
struct vpi_cmd {
@@ -576,10 +580,28 @@ static int jtag_vpi_init(void)
return ERROR_OK;
}
+static int jtag_vpi_stop_simulation(void)
+{
+ struct vpi_cmd cmd;
+ memset(&cmd, 0, sizeof(struct vpi_cmd));
+ cmd.length = 0;
+ cmd.nb_bits = 0;
+ cmd.cmd = CMD_STOP_SIMU;
+ return jtag_vpi_send_cmd(&cmd);
+}
+
static int jtag_vpi_quit(void)
{
+ if (stop_sim_on_exit) {
+ if (jtag_vpi_stop_simulation() != ERROR_OK)
+ LOG_WARNING("jtag_vpi: failed to send \"stop simulation\" command");
+ }
+ if (close_socket(sockfd) != 0) {
+ LOG_WARNING("jtag_vpi: could not close jtag_vpi client socket");
+ log_socket_error("jtag_vpi");
+ }
free(server_address);
- return close_socket(sockfd);
+ return ERROR_OK;
}
COMMAND_HANDLER(jtag_vpi_set_port)
@@ -609,6 +631,17 @@ COMMAND_HANDLER(jtag_vpi_set_address)
return ERROR_OK;
}
+COMMAND_HANDLER(jtag_vpi_stop_sim_on_exit_handler)
+{
+ if (CMD_ARGC != 1) {
+ LOG_ERROR("jtag_vpi_stop_sim_on_exit expects 1 argument (on|off)");
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ } else {
+ COMMAND_PARSE_ON_OFF(CMD_ARGV[0], stop_sim_on_exit);
+ }
+ return ERROR_OK;
+}
+
static const struct command_registration jtag_vpi_command_handlers[] = {
{
.name = "jtag_vpi_set_port",
@@ -624,6 +657,14 @@ static const struct command_registration jtag_vpi_command_handlers[] = {
.help = "set the address of the VPI server",
.usage = "ipv4_addr",
},
+ {
+ .name = "jtag_vpi_stop_sim_on_exit",
+ .handler = &jtag_vpi_stop_sim_on_exit_handler,
+ .mode = COMMAND_CONFIG,
+ .help = "Configure if simulation stop command shall be sent "
+ "before OpenOCD exits (default: off)",
+ .usage = "<on|off>",
+ },
COMMAND_REGISTRATION_DONE
};
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/jtag_vpi.c | 51 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 5 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-15 15:31:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via e8c747048fed28edf1900df56e8ffd5ba77b221e (commit)
from 0a11537b3220749107f4ec78c76236ac8c9339d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e8c747048fed28edf1900df56e8ffd5ba77b221e
Author: Piotr Kasprzyk <ci...@ci...>
Date: Sat Dec 8 18:02:11 2018 +0100
Include start-of-region address
When $ADDRESS == $BASE that address used to be excluded.
After this commit $ADDRESS == $BASE is within the range.
Now the rule for "iswithin" is:
$BASE <= $ADDRESS < ($BASE + $LEN)
Thanks to Antonio Borneo <bor...@gm...> for noticing this.
Change-Id: I74373c6010e069372d886fa7ecd8120892616834
Signed-off-by: Piotr Kasprzyk <ci...@ci...>
Reviewed-on: http://openocd.zylin.com/4799
Tested-by: jenkins
Reviewed-by: Spencer Oliver <sp...@sp...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/memory.tcl b/tcl/memory.tcl
index a7f5b9ac4..3066c1113 100644
--- a/tcl/memory.tcl
+++ b/tcl/memory.tcl
@@ -58,7 +58,7 @@ set ACCESS_WIDTH_ANY [expr $ACCESS_WIDTH_8 + $ACCESS_WIDTH_16 + $ACCESS_WIDTH_3
set UNKNOWN(0,ACCESS_WIDTH) $ACCESS_WIDTH_NONE
proc iswithin { ADDRESS BASE LEN } {
- return [expr ((($ADDRESS - $BASE) > 0) && (($BASE + $LEN - $ADDRESS) > 0))]
+ return [expr ((($ADDRESS - $BASE) >= 0) && (($BASE + $LEN - $ADDRESS) > 0))]
}
proc address_info { ADDRESS } {
-----------------------------------------------------------------------
Summary of changes:
tcl/memory.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-13 20:22:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 0a11537b3220749107f4ec78c76236ac8c9339d1 (commit)
from 6dfcc3f5a5b7101d9d44312e6a96e0bea05a558d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0a11537b3220749107f4ec78c76236ac8c9339d1
Author: Tarek BOCHKATI <tar...@gm...>
Date: Wed Feb 5 19:00:46 2020 +0100
flash/stm32lx: mention explicitly that this driver covers STM32 L0 and L1
this is to avoid confusion with STM32 L4, L4+ and L5 families
also:
- a warning message is changed to error
- stm32l0x and stm32l1x aliases has been created to permit
the usage of either names
Change-Id: If3f16d2a3b7d1369959aa7407da37a9076ea91d7
Signed-off-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-on: http://openocd.zylin.com/5437
Reviewed-by: Marc Schink <de...@za...>
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 1c89d8c0b..cdec3b0f5 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -6852,7 +6852,7 @@ stm32h7x option_write 0 0x20 0x8000000 0x8000000
@end deffn
@deffn {Flash Driver} stm32lx
-All members of the STM32L microcontroller families from STMicroelectronics
+All members of the STM32L0 and STM32L1 microcontroller families from STMicroelectronics
include internal flash and use ARM Cortex-M3 and Cortex-M0+ cores.
The driver automatically recognizes a number of these chips using
the chip identification register, and autoconfigures itself.
diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index e6473f8c2..f112f88f1 100644
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -756,7 +756,7 @@ static int stm32lx_probe(struct flash_bank *bank)
}
if (n == ARRAY_SIZE(stm32lx_parts)) {
- LOG_WARNING("Cannot identify target as a STM32L family.");
+ LOG_ERROR("Cannot identify target as an STM32 L0 or L1 family device.");
return ERROR_FAIL;
} else {
LOG_INFO("Device: %s", stm32lx_info->part_info.device_str);
diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index 63151b50e..725953486 100644
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -109,6 +109,10 @@ proc stm32f3x args { eval stm32f1x $args }
proc stm32f4x args { eval stm32f2x $args }
proc stm32f7x args { eval stm32f2x $args }
+# stm32lx driver supports both STM32 L0 and L1 devices
+proc stm32l0x args { eval stm32lx $args }
+proc stm32l1x args { eval stm32lx $args }
+
# stm32wb uses the same flash driver as the stm32l4x
proc stm32wbx args { eval stm32l4x $args }
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 2 +-
src/flash/nor/stm32lx.c | 2 +-
src/flash/startup.tcl | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-13 20:19:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 6dfcc3f5a5b7101d9d44312e6a96e0bea05a558d (commit)
from 853a05287c987d419440b21e2b22f5ab75297739 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6dfcc3f5a5b7101d9d44312e6a96e0bea05a558d
Author: Tarek BOCHKATI <tar...@gm...>
Date: Wed Feb 5 18:21:15 2020 +0100
flash/startup.tcl: update stm32 flash driver aliases
This will enable us to use either name when calling flash driver commands.
For example the stm32wbx family use the same flash driver as the stm32l4x, so
the user has to use 'stm32l4x lock 0' which can be confusing.
Now the user can also use 'stm32wbx lock 0' with the same result.
Change-Id: Ic0d8da9afc202d7cc82d9b9949827e958a1cc824
Signed-off-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-on: http://openocd.zylin.com/5436
Tested-by: jenkins
Reviewed-by: Marc Schink <de...@za...>
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index de52e2060..63151b50e 100644
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -101,23 +101,16 @@ proc program {filename args} {
add_help_text program "write an image to flash, address is only required for binary images. verify, reset, exit are optional"
add_usage_text program "<filename> \[address\] \[pre-verify\] \[verify\] \[reset\] \[exit\]"
-# stm32f0x uses the same flash driver as the stm32f1x
-# this alias enables the use of either name.
-proc stm32f0x args {
- eval stm32f1x $args
-}
+# stm32[f0x|f3x] uses the same flash driver as the stm32f1x
+proc stm32f0x args { eval stm32f1x $args }
+proc stm32f3x args { eval stm32f1x $args }
-# stm32f3x uses the same flash driver as the stm32f1x
-# this alias enables the use of either name.
-proc stm32f3x args {
- eval stm32f1x $args
-}
+# stm32[f4x|f7x] uses the same flash driver as the stm32f2x
+proc stm32f4x args { eval stm32f2x $args }
+proc stm32f7x args { eval stm32f2x $args }
-# stm32f4x uses the same flash driver as the stm32f2x
-# this alias enables the use of either name.
-proc stm32f4x args {
- eval stm32f2x $args
-}
+# stm32wb uses the same flash driver as the stm32l4x
+proc stm32wbx args { eval stm32l4x $args }
# ease migration to updated flash driver
proc stm32x args {
-----------------------------------------------------------------------
Summary of changes:
src/flash/startup.tcl | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: OpenOCD-Gerrit <ope...@us...> - 2020-02-09 20:07:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 853a05287c987d419440b21e2b22f5ab75297739 (commit)
from b27173d56329ac1c7a7b399110b004e98a9cd8d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 853a05287c987d419440b21e2b22f5ab75297739
Author: Marek Vasut <mar...@gm...>
Date: Sat Feb 8 08:58:53 2020 +0100
jtag: Fix copy-paste error in 'irscan' help
Replace "Instruction Register (DR)" with "Instruction Register (IR)",
that is sed "s@DR@IR@", which was likely a copy-paste error.
Change-Id: I3e625872c855d655485b3efa5f50fe1c00ecbf52
Signed-off-by: Marek Vasut <mar...@gm...>
Reviewed-on: http://openocd.zylin.com/5446
Reviewed-by: Tomas Vanek <va...@fb...>
Tested-by: jenkins
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index ef0cd3f53..ba0cb1d1e 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1314,7 +1314,7 @@ static const struct command_registration jtag_command_handlers[] = {
.name = "irscan",
.handler = handle_irscan_command,
.mode = COMMAND_EXEC,
- .help = "Execute Instruction Register (DR) scan. The "
+ .help = "Execute Instruction Register (IR) scan. The "
"specified opcodes are put into each TAP's IR, "
"and other TAPs are put in BYPASS.",
.usage = "[tap_name instruction]* ['-endstate' state_name]",
-----------------------------------------------------------------------
Summary of changes:
src/jtag/tcl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
