diff --git a/demos/STM32/RT-STM32H743ZI_REV_V-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32H743ZI_REV_V-NUCLEO144/cfg/mcuconf.h
index 1fb9f89b3..055382cb2 100644
--- a/demos/STM32/RT-STM32H743ZI_REV_V-NUCLEO144/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32H743ZI_REV_V-NUCLEO144/cfg/mcuconf.h
@@ -35,22 +35,28 @@
 #define STM32H742_MCUCONF
 #define STM32H743_MCUCONF
 #define STM32H753_MCUCONF
+#define STM32H745_MCUCONF
+#define STM32H755_MCUCONF
+#define STM32H747_MCUCONF
+#define STM32H757_MCUCONF
 
 /*
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
-#define STM32_SYS_CK_ENFORCED_VALUE         STM32_HSICLK
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/demos/STM32/RT-STM32H755ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32H755ZI-NUCLEO144/cfg/mcuconf.h
index c8d3eb032..b31e35a58 100644
--- a/demos/STM32/RT-STM32H755ZI-NUCLEO144/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32H755ZI-NUCLEO144/cfg/mcuconf.h
@@ -44,16 +44,19 @@
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/os/hal/ports/STM32/STM32H7xx/hal_lld.c b/os/hal/ports/STM32/STM32H7xx/hal_lld.c
index 28fed93d3..d3cda6520 100644
--- a/os/hal/ports/STM32/STM32H7xx/hal_lld.c
+++ b/os/hal/ports/STM32/STM32H7xx/hal_lld.c
@@ -186,7 +186,7 @@ void hal_lld_init(void) {
 
     /* The SRAM2 bank can optionally made a non cache-able area for use by
        DMA engines.*/
-    mpuConfigureRegion(MPU_REGION_7,
+    mpuConfigureRegion(STM32_NOCACHE_MPU_REGION,
                        base,
                        MPU_RASR_ATTR_AP_RW_RW |
                        MPU_RASR_ATTR_NON_CACHEABLE |
diff --git a/os/hal/ports/STM32/STM32H7xx/hal_lld.h b/os/hal/ports/STM32/STM32H7xx/hal_lld.h
index 9c679bf40..68fa0fd8d 100644
--- a/os/hal/ports/STM32/STM32H7xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32H7xx/hal_lld.h
@@ -601,6 +601,13 @@
 #define STM32_TARGET_CORE                   1
 #endif
 
+/**
+ * @brief   MPU region to be used for no-cache RAM area.
+ */
+#if !defined(STM32_NOCACHE_MPU_REGION) || defined(__DOXYGEN__)
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
+#endif
+
 /**
  * @brief   Add no-cache attribute to SRAM1 and SRAM2.
  * @note    MPU region 7 is used if enabled.
diff --git a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h
index e35eb01bd..3515ae500 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h
@@ -35,22 +35,28 @@
 #define STM32H742_MCUCONF
 #define STM32H743_MCUCONF
 #define STM32H753_MCUCONF
+#define STM32H745_MCUCONF
+#define STM32H755_MCUCONF
+#define STM32H747_MCUCONF
+#define STM32H757_MCUCONF
 
 /*
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
-#define STM32_SYS_CK_ENFORCED_VALUE         STM32_HSICLK
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h
index 64df3f71c..70469180b 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h
@@ -35,22 +35,28 @@
 #define STM32H742_MCUCONF
 #define STM32H743_MCUCONF
 #define STM32H753_MCUCONF
+#define STM32H745_MCUCONF
+#define STM32H755_MCUCONF
+#define STM32H747_MCUCONF
+#define STM32H757_MCUCONF
 
 /*
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
-#define STM32_SYS_CK_ENFORCED_VALUE         STM32_HSICLK
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h
index 08cda49a1..e31eaea8c 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h
@@ -35,22 +35,28 @@
 #define STM32H742_MCUCONF
 #define STM32H743_MCUCONF
 #define STM32H753_MCUCONF
+#define STM32H745_MCUCONF
+#define STM32H755_MCUCONF
+#define STM32H747_MCUCONF
+#define STM32H757_MCUCONF
 
 /*
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
-#define STM32_SYS_CK_ENFORCED_VALUE         STM32_HSICLK
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h
index fd8a280fd..dc2b38dcb 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h
@@ -35,22 +35,28 @@
 #define STM32H742_MCUCONF
 #define STM32H743_MCUCONF
 #define STM32H753_MCUCONF
+#define STM32H745_MCUCONF
+#define STM32H755_MCUCONF
+#define STM32H747_MCUCONF
+#define STM32H757_MCUCONF
 
 /*
  * General settings.
  */
 #define STM32_NO_INIT                       FALSE
-#define STM32_SYS_CK_ENFORCED_VALUE         STM32_HSICLK
+#define STM32_TARGET_CORE                   1
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
 #define STM32_NOCACHE_SRAM1_SRAM2           FALSE
 #define STM32_NOCACHE_SRAM3                 TRUE
 
 /*
  * PWR system settings.
- * Reading STM32 Reference Manual is required.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
  * Register constants are taken from the ST header.
  */
 #define STM32_ODEN                          STM32_ODEN_DISABLED
diff --git a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl
index dea2fc43e..eb5cbd6ce 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl
@@ -55,11 +55,12 @@
  * General settings.
  */
 #define STM32_NO_INIT                       ${doc.STM32_NO_INIT!"FALSE"}
-#define STM32_TARGET_CORE                   ${doc.STM32_NO_INIT!"1"}
+#define STM32_TARGET_CORE                   ${doc.STM32_TARGET_CORE!"1"}
 
 /*
  * Memory attributes settings.
  */
+#define STM32_NOCACHE_MPU_REGION            ${doc.STM32_NOCACHE_MPU_REGION!"MPU_REGION_6"}
 #define STM32_NOCACHE_SRAM1_SRAM2           ${doc.STM32_NOCACHE_SRAM1_SRAM2!"FALSE"}
 #define STM32_NOCACHE_SRAM3                 ${doc.STM32_NOCACHE_SRAM3!"TRUE"}
 
diff --git a/tools/updater/update_mcuconf_stm32f303xx.sh b/tools/updater/update_mcuconf_stm32f303xx.sh
index 2d5c5ff10..3e5f24ff8 100644
--- a/tools/updater/update_mcuconf_stm32f303xx.sh
+++ b/tools/updater/update_mcuconf_stm32f303xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F303_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f303xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32f407xx.sh b/tools/updater/update_mcuconf_stm32f407xx.sh
index 5e2952a9f..96997ee3a 100644
--- a/tools/updater/update_mcuconf_stm32f407xx.sh
+++ b/tools/updater/update_mcuconf_stm32f407xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F407_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f407xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32f413xx.sh b/tools/updater/update_mcuconf_stm32f413xx.sh
index 661d35beb..2e000a72d 100644
--- a/tools/updater/update_mcuconf_stm32f413xx.sh
+++ b/tools/updater/update_mcuconf_stm32f413xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F413_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f413xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32f72xxx.sh b/tools/updater/update_mcuconf_stm32f72xxx.sh
index f64f803e9..97639e64d 100644
--- a/tools/updater/update_mcuconf_stm32f72xxx.sh
+++ b/tools/updater/update_mcuconf_stm32f72xxx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F722_MCUCONF" <<< "$conffile" || egrep -q "STM32F723_MCUCONF" <<< "$conffile" || egrep -q "STM32F732_MCUCONF" <<< "$conffile" || egrep -q "STM32F733_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f72xxx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32f746xx.sh b/tools/updater/update_mcuconf_stm32f746xx.sh
index fa5bc6bee..997510c6d 100644
--- a/tools/updater/update_mcuconf_stm32f746xx.sh
+++ b/tools/updater/update_mcuconf_stm32f746xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F746_MCUCONF" <<< "$conffile" || egrep -q "STM32F756_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f746xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32f76xxx.sh b/tools/updater/update_mcuconf_stm32f76xxx.sh
index 54ca9dce5..b442dccf5 100644
--- a/tools/updater/update_mcuconf_stm32f76xxx.sh
+++ b/tools/updater/update_mcuconf_stm32f76xxx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32F765_MCUCONF" <<< "$conffile" || egrep -q "STM32F767_MCUCONF" <<< "$conffile" || egrep -q "STM32F777_MCUCONF" <<< "$conffile" || egrep -q "STM32F769_MCUCONF" <<< "$conffile" || egrep -q "STM32F779_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f76xxx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32g071xx.sh b/tools/updater/update_mcuconf_stm32g071xx.sh
index caf6708a1..c9fff1230 100644
--- a/tools/updater/update_mcuconf_stm32g071xx.sh
+++ b/tools/updater/update_mcuconf_stm32g071xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32G071_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g071xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32g4x1xx.sh b/tools/updater/update_mcuconf_stm32g4x1xx.sh
index 65363d9a2..ab71dad3f 100644
--- a/tools/updater/update_mcuconf_stm32g4x1xx.sh
+++ b/tools/updater/update_mcuconf_stm32g4x1xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32G431_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x1xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32g4x4xx.sh b/tools/updater/update_mcuconf_stm32g4x4xx.sh
index aabc33799..76424aaf9 100644
--- a/tools/updater/update_mcuconf_stm32g4x4xx.sh
+++ b/tools/updater/update_mcuconf_stm32g4x4xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32G474_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x4xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32h743xx.sh b/tools/updater/update_mcuconf_stm32h743xx.sh
index b45d9ecf4..14a612633 100644
--- a/tools/updater/update_mcuconf_stm32h743xx.sh
+++ b/tools/updater/update_mcuconf_stm32h743xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32H743_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32h743xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l05xxx.sh b/tools/updater/update_mcuconf_stm32l05xxx.sh
index 0731b4891..7e5b7bd9f 100644
--- a/tools/updater/update_mcuconf_stm32l05xxx.sh
+++ b/tools/updater/update_mcuconf_stm32l05xxx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L052_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l05xxx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l07xxx.sh b/tools/updater/update_mcuconf_stm32l07xxx.sh
index 9709992f4..32a1bd84d 100644
--- a/tools/updater/update_mcuconf_stm32l07xxx.sh
+++ b/tools/updater/update_mcuconf_stm32l07xxx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L072_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l07xxx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l432xx.sh b/tools/updater/update_mcuconf_stm32l432xx.sh
index becaea389..a28773a87 100644
--- a/tools/updater/update_mcuconf_stm32l432xx.sh
+++ b/tools/updater/update_mcuconf_stm32l432xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L432_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l432xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l452xx.sh b/tools/updater/update_mcuconf_stm32l452xx.sh
index 354babdd5..3c4ad99a6 100644
--- a/tools/updater/update_mcuconf_stm32l452xx.sh
+++ b/tools/updater/update_mcuconf_stm32l452xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L452_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l452xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l476xx.sh b/tools/updater/update_mcuconf_stm32l476xx.sh
index 2b9bede4e..9ec804810 100644
--- a/tools/updater/update_mcuconf_stm32l476xx.sh
+++ b/tools/updater/update_mcuconf_stm32l476xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L476_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l476xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l496xx.sh b/tools/updater/update_mcuconf_stm32l496xx.sh
index ae1b95182..37c4bf814 100644
--- a/tools/updater/update_mcuconf_stm32l496xx.sh
+++ b/tools/updater/update_mcuconf_stm32l496xx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L496_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l496xx
     then
       echo
diff --git a/tools/updater/update_mcuconf_stm32l4rxxx.sh b/tools/updater/update_mcuconf_stm32l4rxxx.sh
index 87122d0dc..c62d20e2e 100644
--- a/tools/updater/update_mcuconf_stm32l4rxxx.sh
+++ b/tools/updater/update_mcuconf_stm32l4rxxx.sh
@@ -13,7 +13,7 @@ then
   if egrep -q "STM32L4R5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R9_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S9_MCUCONF" <<< "$conffile"
   then
     echo Processing: $1
-    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
+    egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
     if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l4rxxx
     then
       echo