From a3ed12401b1f7d9578fb7da881d3504e07acfc27 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Tue, 29 Nov 2022 00:34:44 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.openocd.org/c/openocd/+/7384 Tested-by: jenkins --- 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(-) 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" }