Skip to content

Commit 5abbf81

Browse files
committed
fix: align with changes in boards.txt from 2.3.0
1 parent 58786f9 commit 5abbf81

File tree

3 files changed

+3599
-2126
lines changed

3 files changed

+3599
-2126
lines changed

CI/update/templates/boards_db.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ set({{pnum}}_MAXDATASIZE {{config.upload.maximum_data_size}})
88
set({{pnum}}_MCU {{config.build.mcu}})
99
add_library({{pnum}} INTERFACE)
1010
target_compile_options({{pnum}} INTERFACE
11-
"SHELL:{{config.build.extra_flags}}"
11+
"SHELL:{{config.build.st_extra_flags}}"
1212
"SHELL:{{config.build.peripheral_pins}}"
1313
"SHELL:{{config.build.startup_file}}"
14-
"SHELL:{{config.build.flags.fp}}"
15-
"SHELL:{{config.build.startup_file}}"
14+
"SHELL:{{config.build.fpu}} {{config.build["float-abi"]}}"
1615
-mcpu={{ "${" }}{{pnum}}_MCU{{ "}" }}
1716
)
1817
target_compile_definitions({{pnum}} INTERFACE
@@ -36,7 +35,7 @@ target_link_options({{pnum}} INTERFACE
3635
"LINKER:--defsym=LD_FLASH_OFFSET={{config.build.flash_offset or "0"}}"
3736
"LINKER:--defsym=LD_MAX_SIZE={{config.upload.maximum_size}}"
3837
"LINKER:--defsym=LD_MAX_DATA_SIZE={{config.upload.maximum_data_size}}"
39-
"SHELL:{{config.build.flags.fp}}"
38+
"SHELL:{{config.build.fpu}} {{config.build["float-abi"]}}"
4039
-mcpu={{ "${" }}{{pnum}}_MCU{{ "}" }}
4140
)
4241
target_link_libraries({{pnum}} INTERFACE

CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ set(BUILD_OPT "s" CACHE STRING "Optimization level")
2020
set(BUILD_DBG OFF CACHE BOOL "Enable debug symbols")
2121
set(BUILD_LTO OFF CACHE BOOL "Enable Link-Time-Optimisations")
2222
set(BUILD_RELPATH ON CACHE BOOL "make __FILE__ be relative instead of absolute")
23+
set(BUILD_NDEBUG ON CACHE BOOL "define the NDEBUG macro?")
2324

2425
set(USB_PID 0)
2526
set(USB_VID 0)
@@ -42,6 +43,10 @@ if(${BUILD_RELPATH})
4243
)
4344
endif()
4445

46+
if(${BUILD_NDEBUG})
47+
add_compile_definitions(core_config INTERFACE NDEBUG)
48+
endif()
49+
4550
# configuration specifics
4651
if (${FEAT_XSERIAL} STREQUAL "GENERIC")
4752
target_compile_definitions(core_config INTERFACE

0 commit comments

Comments
 (0)