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 <borneo.antonio@gmail.com>
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 4373962e4455cadcfe52a0e89bff1d5a937a922e..722305dcf446d5fef7849f41fb4fde325996347c 100644 (file)
--- 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 f5f7fc9a49a450b47c1311298f31101f6fc18adc..5b03899256579e666cfe1b00ba41f1cf785b7475 100644 (file)
--- 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 d80f4ef6fc9a95eef6c023b9bea38e104afde4ff..738d22110c0416dfcd2e68439740b0561f978f8a 100644 (file)
--- 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 89337297891789f53fa3ba115e2420ad5a4141f4..9734a18376d13f92ab7919174e2d643ae0e6f2ec 100644 (file)
--- 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"
     }