diff --git a/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface/cyhal_hw_types.h b/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface/cyhal_hw_types.h
index c8ae7ca42..0436834af 100644
--- a/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface/cyhal_hw_types.h
+++ b/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface/cyhal_hw_types.h
@@ -81,11 +81,17 @@ typedef struct
     void *empty;
 } cyhal_spi_t;
 
+
+#include "whd_debug.h"
+
+#if defined(WPRINT_ENABLE_WHD_ERROR) || defined(WPRINT_ENABLE_WHD_INFO) || defined(WPRINT_ENABLE_WHD_DEBUG)
 /** \} group_hal_hw_types_data_structures */
 #define PRINTF(...)   do { \
                       (void) printf(__VA_ARGS__); \
                       } while (0)
-
+#else
+#define PRINTF(...)
+#endif
 
 #include "whd_config.h"
 
diff --git a/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/src/include/whd_debug.h b/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/src/include/whd_debug.h
index 1d601f4a5..467f208b3 100644
--- a/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/src/include/whd_debug.h
+++ b/cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/src/include/whd_debug.h
@@ -36,7 +36,7 @@ extern "C"
 #define WPRINT_ENABLE_WHD_DEBUG
 
 #define WHD_ENABLE_STATS
-/*#define WHD_LOGGING_BUFFER_ENABLE*/
+#define WHD_LOGGING_BUFFER_ENABLE
 
 #if defined (__GNUC__)
 #define WHD_TRIGGER_BREAKPOINT( ) do { __asm__ ("bkpt"); } while (0)
diff --git a/variants/PORTENTA_H7_M7/cflags.txt b/variants/PORTENTA_H7_M7/cflags.txt
index 51e4d8f2a..dc1b4190c 100644
--- a/variants/PORTENTA_H7_M7/cflags.txt
+++ b/variants/PORTENTA_H7_M7/cflags.txt
@@ -19,7 +19,6 @@
 -fdata-sections
 -ffunction-sections
 -fmessage-length=0
--fno-exceptions
 -fomit-frame-pointer
 -funsigned-char
 -g
diff --git a/variants/PORTENTA_H7_M7/cxxflags.txt b/variants/PORTENTA_H7_M7/cxxflags.txt
index 04b2d6bdb..5299eb4d2 100644
--- a/variants/PORTENTA_H7_M7/cxxflags.txt
+++ b/variants/PORTENTA_H7_M7/cxxflags.txt
@@ -21,7 +21,6 @@
 -fdata-sections
 -ffunction-sections
 -fmessage-length=0
--fno-exceptions
 -fomit-frame-pointer
 -funsigned-char
 -g
diff --git a/variants/PORTENTA_H7_M7/defines.txt b/variants/PORTENTA_H7_M7/defines.txt
index da2c6d868..8c138e5e8 100644
--- a/variants/PORTENTA_H7_M7/defines.txt
+++ b/variants/PORTENTA_H7_M7/defines.txt
@@ -43,7 +43,7 @@
 -DFEATURE_LWIP=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1593769507.0922682
+-DMBED_BUILD_TIMESTAMP=1594723597.151386
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_HEAP_STATS_ENABLED=1
 -DMBED_MEM_TRACING_ENABLED=1
diff --git a/variants/PORTENTA_H7_M7/libs/libmbed.a b/variants/PORTENTA_H7_M7/libs/libmbed.a
index 343609f35..67bc4cab1 100644
Binary files a/variants/PORTENTA_H7_M7/libs/libmbed.a and b/variants/PORTENTA_H7_M7/libs/libmbed.a differ