From 93ef2c8641b92ad55458f86d51b7c9e6265ce163 Mon Sep 17 00:00:00 2001
From: Davide Mor <davide.mor@skywarder.eu>
Date: Fri, 16 Feb 2024 16:08:33 +0100
Subject: [PATCH] [bsp] Updated -O settings, and fixed ciuti define

---
 src/bsps/stm32f205rc_ciuti/config/board_options.cmake     | 8 ++++++--
 .../stm32f429zi_death_stack_v1/config/board_options.cmake | 5 ++++-
 .../stm32f429zi_death_stack_v2/config/board_options.cmake | 5 ++++-
 .../stm32f429zi_death_stack_v3/config/board_options.cmake | 5 ++++-
 src/bsps/stm32f429zi_nokia/config/board_options.cmake     | 7 +++++--
 src/bsps/stm32f429zi_parafoil/config/board_options.cmake  | 5 ++++-
 .../config/board_options.cmake                            | 5 ++++-
 src/bsps/stm32f429zi_rig/config/board_options.cmake       | 5 ++++-
 src/bsps/stm32f756zg_nucleo/config/board_options.cmake    | 5 ++++-
 .../config/board_options.cmake                            | 5 ++++-
 .../stm32f767zi_compute_unit/config/board_options.cmake   | 5 ++++-
 .../stm32f767zi_death_stack_v4/config/board_options.cmake | 5 ++++-
 src/bsps/stm32f767zi_gemini_gs/config/board_options.cmake | 5 ++++-
 .../stm32f767zi_gemini_motor/config/board_options.cmake   | 5 ++++-
 14 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/bsps/stm32f205rc_ciuti/config/board_options.cmake b/src/bsps/stm32f205rc_ciuti/config/board_options.cmake
index 2c0856354..da5de1bfb 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 f9da510a8..65b3e33ec 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 9b4741c60..470164534 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 21174c223..0ead6ccb4 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 c531b5c9a..248110df1 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 9e545b1cf..b04a08c71 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 cb77b98dd..796101f85 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 7b87f4a0e..88e7cae5e 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 079c7af5d..1fa4eed3a 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 276c30af5..eca02a920 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 d0bceacf5..c8c823319 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 944580554..3ab46c024 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 259876fc5..84585d7c3 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 5608769a1..c13917a0b 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)
-- 
GitLab