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"
     }