diff --git a/source/hal/cmsis_device/CMakeLists.txt b/source/hal/cmsis_device/CMakeLists.txt
index 255bd30..b98feb2 100644
--- a/source/hal/cmsis_device/CMakeLists.txt
+++ b/source/hal/cmsis_device/CMakeLists.txt
@@ -56,13 +56,18 @@
 # Device definition needs to be set, is checked in source files to include correct header
 target_compile_definitions(${CMSIS_DEVICE_TARGET} PUBLIC ${ARM_CPU})
 
-
 # Tell linker that reset interrupt handler is our entry point
 target_link_options(
     ${CMSIS_DEVICE_TARGET}
     INTERFACE
     --entry Reset_Handler)
 
+# Check if semihosting configuration is available
+if (COMMAND configure_semihosting)
+    option(USE_SEMIHOSTING "Enable/disable semihosting option" OFF)
+    configure_semihosting(${CMSIS_DEVICE_TARGET} ${USE_SEMIHOSTING})
+endif()
+
 # 4 Display status:
 message(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR})
 message(STATUS "*******************************************************")
diff --git a/source/hal/platform/mps3/source/platform_drivers.c b/source/hal/platform/mps3/source/platform_drivers.c
index 3046c12..fc119ab 100644
--- a/source/hal/platform/mps3/source/platform_drivers.c
+++ b/source/hal/platform/mps3/source/platform_drivers.c
@@ -17,9 +17,9 @@
 
 #include "platform_drivers.h"
 
-#include "uart_stdout.h"    /* stdout over UART. */
 #include "log_macros.h"     /* Logging functions */
 #include "device_mps3.h"    /* FPGA level definitions and functions. */
+#include "uart_stdout.h"    /* stdout over UART. */
 
 #include <string.h>         /* For strncpy */
 
diff --git a/source/hal/profiles/bare-metal/bsp/retarget.c b/source/hal/profiles/bare-metal/bsp/retarget.c
index dfef62c..9ed3004 100644
--- a/source/hal/profiles/bare-metal/bsp/retarget.c
+++ b/source/hal/profiles/bare-metal/bsp/retarget.c
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !defined(USE_SEMIHOSTING)
 
 #include "uart_stdout.h"
 
@@ -266,3 +267,5 @@
 }
 
 #endif /* #ifndef ferror */
+
+#endif /* !defined(USE_SEMIHOSTING) */