diff --git a/src/bsps/stm32f205rc_ciuti/config/board_options.cmake b/src/bsps/stm32f205rc_ciuti/config/board_options.cmake
index 2c0856354d6e7cb423d58f4d677de9142614dc17..da5de1bfb3f8401adfdba1d272c680be52e94dc4 100644
--- a/src/bsps/stm32f205rc_ciuti/config/board_options.cmake
+++ b/src/bsps/stm32f205rc_ciuti/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
@@ -76,8 +79,9 @@ set(AFLAGS_BASE ${FLAGS_BASE})
 set(LFLAGS_BASE ${FLAGS_BASE} -Wl,--gc-sections,-Map,main.map -Wl,-T${LINKER_SCRIPT} ${OPT_EXCEPT} ${OPT_OPTIMIZATION} -nostdlib)
 
 # Flags for C/C++
+string(TOUPPER ${BOARD_NAME} BOARD_UPPER)
 set(CFLAGS_BASE
-    -D_BOARD_STM32F205_GENERIC "-D_MIOSIX_BOARDNAME=\"${BOARD_NAME}\""
+    -D_BOARD_${BOARD_UPPER} "-D_MIOSIX_BOARDNAME=\"${BOARD_NAME}\""
     -D_DEFAULT_SOURCE=1 -ffunction-sections -Wall -Werror=return-type -g
     -D_ARCH_CORTEXM3_STM32F2
     ${CLOCK_FREQ} ${XRAM} ${FLAGS_BASE} ${OPT_OPTIMIZATION} -c
diff --git a/src/bsps/stm32f429zi_death_stack_v1/config/board_options.cmake b/src/bsps/stm32f429zi_death_stack_v1/config/board_options.cmake
index f9da510a8b6b58d3d9d4b26b56a2e3c61504576a..65b3e33ec30cbb15828b48ac27a8f7a34ccca579 100644
--- a/src/bsps/stm32f429zi_death_stack_v1/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_death_stack_v1/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot and linker files
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f429zi_death_stack_v2/config/board_options.cmake b/src/bsps/stm32f429zi_death_stack_v2/config/board_options.cmake
index 9b4741c604f63dc4101fa7ffb42049e1398f08c7..470164534eacb0f30108ca1f9af47848b7f53536 100644
--- a/src/bsps/stm32f429zi_death_stack_v2/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_death_stack_v2/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot and linker files
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f429zi_death_stack_v3/config/board_options.cmake b/src/bsps/stm32f429zi_death_stack_v3/config/board_options.cmake
index 21174c2231d33e1b2d6950418463a89dc38aef21..0ead6ccb4814d30f47592a20f942bc051292158e 100644
--- a/src/bsps/stm32f429zi_death_stack_v3/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_death_stack_v3/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot and linker files
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f429zi_nokia/config/board_options.cmake b/src/bsps/stm32f429zi_nokia/config/board_options.cmake
index c531b5c9aac4a7eb0eabe012e550987332c70dca..248110df18a1366e670b15df089857b664b42904 100644
--- a/src/bsps/stm32f429zi_nokia/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_nokia/config/board_options.cmake
@@ -49,7 +49,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
@@ -101,7 +104,7 @@ set(LFLAGS_BASE ${FLAGS_BASE} -Wl,--gc-sections,-Map,main.map -Wl,-T${LINKER_SCR
 # Flags for C/C++
 string(TOUPPER ${BOARD_NAME} BOARD_UPPER)
 set(CFLAGS_BASE
-    -D_BOARD_STM32F429ZI_NOKIA -D_MIOSIX_BOARDNAME=\"${BOARD_NAME}\"
+    -D_BOARD_${BOARD_NAME} -D_MIOSIX_BOARDNAME=\"${BOARD_NAME}\"
     -D_DEFAULT_SOURCE=1 -ffunction-sections -Wall -Werror=return-type -g
     -D_ARCH_CORTEXM4_STM32F4
     ${CLOCK_FREQ} ${XRAM} ${SRAM_BOOT} ${FLAGS_BASE} ${OPT_OPTIMIZATION} -c
diff --git a/src/bsps/stm32f429zi_parafoil/config/board_options.cmake b/src/bsps/stm32f429zi_parafoil/config/board_options.cmake
index 9e545b1cf32b8f1d1db8c4d9b3e238af155c0417..b04a08c71b7ccb5080b98d37a23c3563facdb835 100644
--- a/src/bsps/stm32f429zi_parafoil/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_parafoil/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot and linker files
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f429zi_pyxis_auxiliary/config/board_options.cmake b/src/bsps/stm32f429zi_pyxis_auxiliary/config/board_options.cmake
index cb77b98ddf524c6e57ee621d3eeabef265fdd996..796101f857bb6ef9a5c6bf0bdf666ac17f69caae 100644
--- a/src/bsps/stm32f429zi_pyxis_auxiliary/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_pyxis_auxiliary/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot and linker files
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f429zi_rig/config/board_options.cmake b/src/bsps/stm32f429zi_rig/config/board_options.cmake
index 7b87f4a0ee9d2183b589dc4649cc6e9b7e468168..88e7cae5ecc3866af34c1a282d135e39ddf9ce2e 100644
--- a/src/bsps/stm32f429zi_rig/config/board_options.cmake
+++ b/src/bsps/stm32f429zi_rig/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f756zg_nucleo/config/board_options.cmake b/src/bsps/stm32f756zg_nucleo/config/board_options.cmake
index 079c7af5d7c16018fccc7572f16eb49e45d09806..1fa4eed3ac78b92dc9dd6d71b437df141a59d63e 100644
--- a/src/bsps/stm32f756zg_nucleo/config/board_options.cmake
+++ b/src/bsps/stm32f756zg_nucleo/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f767zi_automated_antennas/config/board_options.cmake b/src/bsps/stm32f767zi_automated_antennas/config/board_options.cmake
index 276c30af5c023db8d740e9e00674bede9e7aa519..eca02a9201d4691cc98238e12e565cbeede6a997 100644
--- a/src/bsps/stm32f767zi_automated_antennas/config/board_options.cmake
+++ b/src/bsps/stm32f767zi_automated_antennas/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f767zi_compute_unit/config/board_options.cmake b/src/bsps/stm32f767zi_compute_unit/config/board_options.cmake
index d0bceacf53e293b9d07a8ad1d007c1ac477939b9..c8c8233196b555b13fc3e3669448448ea0d38a02 100644
--- a/src/bsps/stm32f767zi_compute_unit/config/board_options.cmake
+++ b/src/bsps/stm32f767zi_compute_unit/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f767zi_death_stack_v4/config/board_options.cmake b/src/bsps/stm32f767zi_death_stack_v4/config/board_options.cmake
index 9445805546567654219f69c83c2359d4304ce391..3ab46c024291a5d6d3d198bb7a48f942f948e5f6 100644
--- a/src/bsps/stm32f767zi_death_stack_v4/config/board_options.cmake
+++ b/src/bsps/stm32f767zi_death_stack_v4/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f767zi_gemini_gs/config/board_options.cmake b/src/bsps/stm32f767zi_gemini_gs/config/board_options.cmake
index 259876fc5eb9657fd18d6dc79447c394da01dd2b..84585d7c3e87b12d59690eb5811a708095b78a88 100644
--- a/src/bsps/stm32f767zi_gemini_gs/config/board_options.cmake
+++ b/src/bsps/stm32f767zi_gemini_gs/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)
diff --git a/src/bsps/stm32f767zi_gemini_motor/config/board_options.cmake b/src/bsps/stm32f767zi_gemini_motor/config/board_options.cmake
index 5608769a118128ab55cadb93379ca6a6603a7720..c13917a0b8b7a42d3e022f734d70b76aac667850 100644
--- a/src/bsps/stm32f767zi_gemini_motor/config/board_options.cmake
+++ b/src/bsps/stm32f767zi_gemini_motor/config/board_options.cmake
@@ -46,7 +46,10 @@ set(BOARD_MXGUI_SETTINGS_PATH ${BOARD_PATH})
 # -Og Optimize debugging experience, enables optimizations that do not
 # interfere with debugging
 # -Os Optimize for size with -O2 optimizations that do not increase code size
-set(OPT_OPTIMIZATION -O2)
+set(OPT_OPTIMIZATION
+    $<$<CONFIG:Debug>:-O2>
+    $<$<CONFIG:Release>:-O2>
+)
 
 # Boot file and linker script
 set(BOOT_FILE ${BOARD_PATH}/core/stage_1_boot.cpp)