The openocd-0.6.0 release.

Change-Id: I72eeabfc704d2a979ac0b4492771690631d2300f Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>
stlink: issue error for stm32 option writing
2025-10-16 06:07:25 +08:00 · 2012-09-07 10:24:36 +02:00 · 2012-09-07 06:17:07 +00:00 · 2012-09-07 06:16:57 +00:00 · 2012-09-06 19:19:22 +00:00 · 2012-09-06 19:19:09 +00:00
5 changed files with 27 additions and 8 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([openocd], [0.6.0-rc2],
+AC_INIT([openocd], [0.6.0],
  [OpenOCD Mailing List <openocd-devel@lists.sourceforge.net>])
 AC_CONFIG_SRCDIR([src/openocd.c])

@@ -224,7 +224,7 @@ __EOF__
 # In case (1) and (2) we need to know where the package was unpacked.

 AC_ARG_WITH(ftd2xx-win32-zipdir,
-  AS_HELP_STRING([--with-ftd2xx-win32-zipdir],[Where (CYGWIN/MINGW) the zip file from ftdichip.com was unpacked <default=search>]),
+  AS_HELP_STRING([--with-ftd2xx-win32-zipdir],[Where (CYGWIN/MINGW) the zip file from ftdichip.com was unpacked (default=search)]),
  [
  # option present
  if test -d $with_ftd2xx_win32_zipdir
@@ -237,7 +237,7 @@ AC_ARG_WITH(ftd2xx-win32-zipdir,
  ], [true])

 AC_ARG_WITH(ftd2xx-linux-tardir,
-  AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked <default=search>]),
+  AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked (default=search)]),
  [
  # Option present
  if test $is_win32 = yes ; then
@@ -254,7 +254,7 @@ AC_ARG_WITH(ftd2xx-linux-tardir,

 AC_ARG_WITH(ftd2xx-lib,
  AS_HELP_STRING([--with-ftd2xx-lib],
-    [Use static or shared ftd2xx libs on default static]),
+    [Use static or shared ftd2xx libs (default=static)]),
  [
  case "$withval" in
  static)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -174,7 +174,7 @@ The OpenOCD web site provides the latest public news from the community:

 The user's guide you are now reading may not be the latest one
 available.  A version for more recent code may be available.
-Its HTML form is published irregularly at:
+Its HTML form is published regularly at:

@uref{http://openocd.sourceforge.net/doc/html/index.html}

@@ -192,6 +192,17 @@ instead of this forum.

@uref{http://forum.sparkfun.com/viewforum.php?f=18}

+@section OpenOCD User's Mailing List
+
+The OpenOCD User Mailing List provides the primary means of
+communication between users:
+
+@uref{https://lists.sourceforge.net/mailman/listinfo/openocd-user}
+
+@section OpenOCD IRC
+
+Support can also be found on irc:
+@uref{irc://irc.freenode.net/openocd}

@node Developers
@chapter OpenOCD Developer Resources
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -3018,7 +3018,7 @@ static int sam3_page_read(struct sam3_bank_private *pPrivate, unsigned pagenum,
 	int r;

 	adr = pagenum * pPrivate->page_size;
-	adr += adr + pPrivate->base_address;
+	adr += pPrivate->base_address;

 	r = target_read_memory(pPrivate->pChip->target,
 			adr,
@@ -3126,7 +3126,7 @@ static int sam3_page_write(struct sam3_bank_private *pPrivate, unsigned pagenum,
 	int r;

 	adr = pagenum * pPrivate->page_size;
-	adr += (adr + pPrivate->base_address);
+	adr += pPrivate->base_address;

 	/* Get flash mode register value */
 	r = target_read_u32(pPrivate->pChip->target, pPrivate->controller_address, &fmr);
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -249,6 +249,14 @@ static int stm32x_erase_options(struct flash_bank *bank)

 	stm32x_info = bank->driver_priv;

+	/* stlink is currently does not support 16bit
+	 * read/writes. so we cannot write option bytes */
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	if (armv7m && armv7m->stlink) {
+		LOG_ERROR("Option bytes currently unsupported for stlink");
+		return ERROR_FAIL;
+	}
+
 	/* read current options */
 	stm32x_read_options(bank);

--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1025,7 +1025,7 @@ static int cortex_m3_assert_reset(struct target *target)

 		if (reset_config == CORTEX_M3_RESET_VECTRESET) {
 			LOG_WARNING("Only resetting the Cortex-M3 core, use a reset-init event "
-				"handler to reset any peripherals");
+				"handler to reset any peripherals or configure hardware srst support.");
 		}

 		{
Author	SHA1	Message	Date
Freddie Chopin	370d02b857	The openocd-0.6.0 release. Change-Id: I72eeabfc704d2a979ac0b4492771690631d2300f Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-07 10:24:36 +02:00
Spencer Oliver	552e027f68	stlink: issue error for stm32 option writing The stlink interface currently does not support 16bit read/writes. Until a fix is included we issue a error that this is unsupported. Change-Id: I4552cf2bd3b29e90ecc905325b743c08e2b92d67 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/808 Tested-by: jenkins Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-07 06:17:07 +00:00
Chuen Chou	e26ddb627b	flash: fix sam3 page read/write address computation error In at91sam3.c for Atmel SAM3 flash support, there are arithmetic errors in the functions sam3_page_read() and sam3_page_write(). Address locations are computed incorrectly due to an extra addition operation. This leads to memory locations being skipped during flash writes and reads. Smaller programs are written successfully into flash, with memory gaps, while larger programs of legitimate size fail because the skipped memory is not utilized and therefore unavailable. The changes address this condition, and have been tested with an Atmel SAM3X-EK evaluation board. Change-Id: I9ea3b9ed0130b71cbc32b2294e31a6a2bc71b47a Signed-off-by: Chuen Chou <zhouquan27@gmail.com> Reviewed-on: http://openocd.zylin.com/806 Tested-by: jenkins Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-07 06:16:57 +00:00
Spencer Oliver	8a197f0bbc	configure: use consistent help text Change-Id: I5e1d7c88e9310e6415f3663d7a657f516bd24660 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/803 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-06 19:19:22 +00:00
Spencer Oliver	37f8f0bf9a	docs: add user mailing list and irc info Change-Id: I7000b5ab2967f8dc4cea8983978fce824ea1f98e Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/807 Tested-by: jenkins Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-06 19:19:09 +00:00
Spencer Oliver	39f3501afb	cortex_m: suggest using hardware srst if VECTRESET used If the target does not support SYSRESETREQ we fall back to using VECTRESET. This however does not reset the peripherals and we issue a warning to the user to suggest using a reset-init script. Also suggest that using hardware srst will give them the same functionality as using SYSRESETREQ. Change-Id: Ie1781c4b849fed66c52222e6539735537c879fb3 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/802 Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Tested-by: jenkins Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-09-06 19:19:03 +00:00
Freddie Chopin	9fbfb6103a	Restore -dev tag. Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>	2012-08-29 09:58:04 +02:00