[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-795-g6d6207a8d

[OpenOCD-Gerrit <ope...@us...>]

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  6d6207a8d3970beac73840a184af79d8dbeb1fbf (commit)
      from  81aa5fd6b477cb03b718625a48e50099fc2ae0f2 (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 6d6207a8d3970beac73840a184af79d8dbeb1fbf
Author: Asier Llano <al...@hu...>
Date:   Thu Jul 21 12:27:11 2022 +0200

    rtos: Support for "none" rtos
    
    After a certain RTOS has been configured there is no mechanism
    to go back to no RTOS support. It may be useful for debugging
    purposes. With the provided modification, the "none" option
    of RTOS is provided as a valid option.
    
    It has been tested in two different board (Cortex M4 and Cortex M33).
    Documentation has also been updated.
    
    Signed-off-by: Asier Llano <al...@hu...>
    Change-Id: I602210bff31ccadd41c41e9454c52b5fffa1671e
    Reviewed-on: https://review.openocd.org/c/openocd/+/7092
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 1d63b20b7..995861d18 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -5149,7 +5149,7 @@ The value should normally correspond to a static mapping for the
 
 @anchor{rtostype}
 @item @code{-rtos} @var{rtos_type} -- enable rtos support for target,
-@var{rtos_type} can be one of @option{auto}, @option{eCos},
+@var{rtos_type} can be one of @option{auto}, @option{none}, @option{eCos},
 @option{ThreadX}, @option{FreeRTOS}, @option{linux}, @option{ChibiOS},
 @option{embKernel}, @option{mqx}, @option{uCOS-III}, @option{nuttx},
 @option{RIOT}, @option{Zephyr}
@@ -11848,6 +11848,11 @@ Currently supported rtos's include:
 @item @option{Zephyr}
 @end itemize
 
+At any time, it's possible to drop the selected RTOS using:
+@example
+$_TARGETNAME configure -rtos none
+@end example
+
 Before an RTOS can be detected, it must export certain symbols; otherwise, it cannot
 be used by OpenOCD. Below is a list of the required symbols for each supported RTOS.
 
diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 013080bb0..3e43e828d 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -129,6 +129,9 @@ int rtos_create(struct jim_getopt_info *goi, struct target *target)
 	if (e != JIM_OK)
 		return e;
 
+	if (strcmp(cp, "none") == 0)
+		return JIM_OK;
+
 	if (strcmp(cp, "auto") == 0) {
 		/* Auto detect tries to look up all symbols for each RTOS,
 		 * and runs the RTOS driver's _detect() function when GDB
@@ -148,7 +151,7 @@ int rtos_create(struct jim_getopt_info *goi, struct target *target)
 	res = Jim_GetResult(goi->interp);
 	for (x = 0; rtos_types[x]; x++)
 		Jim_AppendStrings(goi->interp, res, rtos_types[x]->name, ", ", NULL);
-	Jim_AppendStrings(goi->interp, res, " or auto", NULL);
+	Jim_AppendStrings(goi->interp, res, ", auto or none", NULL);
 
 	return JIM_ERR;
 }

-----------------------------------------------------------------------

Summary of changes:
 doc/openocd.texi | 7 ++++++-
 src/rtos/rtos.c  | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository