fix: align with changes in boards.txt from 2.3.0

massonal · fpistm · commit 2f2feb1b1b49 · 2022-12-20T14:52:41.000+01:00
diff --git a/CI/update/templates/boards_db.cmake b/CI/update/templates/boards_db.cmake
@@ -8,11 +8,10 @@ set({{pnum}}_MAXDATASIZE {{config.upload.maximum_data_size}})
 set({{pnum}}_MCU {{config.build.mcu}})
 add_library({{pnum}} INTERFACE)
 target_compile_options({{pnum}} INTERFACE
-  "SHELL:{{config.build.extra_flags}}"
+  "SHELL:{{config.build.st_extra_flags}}"
   "SHELL:{{config.build.peripheral_pins}}"
   "SHELL:{{config.build.startup_file}}"
-  "SHELL:{{config.build.flags.fp}}"
-  "SHELL:{{config.build.startup_file}}"
+  "SHELL:{{config.build.fpu}} {{config.build["float-abi"]}}"
   -mcpu={{ "${" }}{{pnum}}_MCU{{ "}" }}
 )
 target_compile_definitions({{pnum}} INTERFACE
@@ -36,7 +35,7 @@ target_link_options({{pnum}} INTERFACE
   "LINKER:--defsym=LD_FLASH_OFFSET={{config.build.flash_offset or "0"}}"
 	"LINKER:--defsym=LD_MAX_SIZE={{config.upload.maximum_size}}"
 	"LINKER:--defsym=LD_MAX_DATA_SIZE={{config.upload.maximum_data_size}}"
-  "SHELL:{{config.build.flags.fp}}"
+  "SHELL:{{config.build.fpu}} {{config.build["float-abi"]}}"
   -mcpu={{ "${" }}{{pnum}}_MCU{{ "}" }}
 )
 target_link_libraries({{pnum}} INTERFACE
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,7 @@ set(BUILD_OPT "s" CACHE STRING "Optimization level")
 set(BUILD_DBG OFF CACHE BOOL "Enable debug symbols")
 set(BUILD_LTO OFF CACHE BOOL "Enable Link-Time-Optimisations")
 set(BUILD_RELPATH ON CACHE BOOL "make __FILE__ be relative instead of absolute")
+set(BUILD_NDEBUG ON CACHE BOOL "define the NDEBUG macro?")
 
 set(USB_PID 0)
 set(USB_VID 0)
@@ -42,6 +43,10 @@ if(${BUILD_RELPATH})
   )
 endif()
 
+if(${BUILD_NDEBUG})
+  add_compile_definitions(core_config INTERFACE NDEBUG)
+endif()
+
 # configuration specifics
 if (${FEAT_XSERIAL} STREQUAL "GENERIC")
 	target_compile_definitions(core_config INTERFACE
diff --git a/cmake/boards_db.cmake b/cmake/boards_db.cmake
