[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-36-ga3ed12401

[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  a3ed12401b1f7d9578fb7da881d3504e07acfc27 (commit)
      from  5292c7eae925d59d6b6c0017b6a4995d39a6e9ee (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 a3ed12401b1f7d9578fb7da881d3504e07acfc27
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Nov 29 00:34:44 2022 +0100

    tcl/target: enable -rtos hwthread
    
    The rtos hwthread has been merged in 2019 with commit 85ba2dc4c6ab
    ("rtos/hwthread: add hardware-thread pseudo rtos").
    During review in patchset 19 the name of the rtos has been changed
    from 'hawt' to 'hwthread'.
    
    Some target config file was already merged ready for hwthread, but
    keeping the relevant lines commented and still reporting the old
    name.
    
    Enable rtos hwtread to the target that were supposed to use it.
    Fix the name of the rtos.
    
    Change-Id: I877862dcdba39f26462bb542bac06d1a5f5f222d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7384
    Tested-by: jenkins

diff --git a/tcl/target/hi3798.cfg b/tcl/target/hi3798.cfg
index 4373962e4..722305dcf 100644
--- a/tcl/target/hi3798.cfg
+++ b/tcl/target/hi3798.cfg
@@ -42,8 +42,7 @@ for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
         #set _command "$_command -defer-examine"
         set _smp_command "$_smp_command ${_TARGETNAME}$_core"
     } else {
-        # uncomment when "hawt" rtos is merged
-        # set _command "$_command -rtos hawt"
+        set _command "$_command -rtos hwthread"
         set _smp_command "target smp ${_TARGETNAME}$_core"
     }
 
diff --git a/tcl/target/hi6220.cfg b/tcl/target/hi6220.cfg
index f5f7fc9a4..5b0389925 100644
--- a/tcl/target/hi6220.cfg
+++ b/tcl/target/hi6220.cfg
@@ -49,8 +49,7 @@ for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
         set _command "$_command -defer-examine"
         set _smp_command "$_smp_command ${_TARGETNAME}$_core"
     } else {
-        # uncomment when "hawt" rtos is merged
-        # set _command "$_command -rtos hawt"
+        set _command "$_command -rtos hwthread"
         set _smp_command "target smp ${_TARGETNAME}$_core"
     }
 
diff --git a/tcl/target/marvell/88f37x0.cfg b/tcl/target/marvell/88f37x0.cfg
index d80f4ef6f..738d22110 100644
--- a/tcl/target/marvell/88f37x0.cfg
+++ b/tcl/target/marvell/88f37x0.cfg
@@ -57,8 +57,7 @@ for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
         set _command "$_command -defer-examine"
         set _smp_command "$_smp_command ${_TARGETNAME}$_core"
     } else {
-        # uncomment when "hawt" rtos is merged
-        # set _command "$_command -rtos hawt"
+        set _command "$_command -rtos hwthread"
         set _smp_command "target smp ${_TARGETNAME}$_core"
     }
 
diff --git a/tcl/target/xilinx_zynqmp.cfg b/tcl/target/xilinx_zynqmp.cfg
index 893372978..9734a1837 100644
--- a/tcl/target/xilinx_zynqmp.cfg
+++ b/tcl/target/xilinx_zynqmp.cfg
@@ -86,8 +86,7 @@ for { set _core 0 } { $_core < $_cores } { incr _core } {
         set _command "$_command -defer-examine"
         set _smp_command "$_smp_command $_TARGETNAME.$_core"
     } else {
-        # uncomment when "hawt" rtos is merged
-        #set _command "$_command -rtos hawt"
+        set _command "$_command -rtos hwthread"
         set _smp_command "target smp $_TARGETNAME.$_core"
     }
 

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

Summary of changes:
 tcl/target/hi3798.cfg          | 3 +--
 tcl/target/hi6220.cfg          | 3 +--
 tcl/target/marvell/88f37x0.cfg | 3 +--
 tcl/target/xilinx_zynqmp.cfg   | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository