File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
targets/TARGET_Silicon_Labs/TARGET_EFM32 Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -255,7 +255,12 @@ endif()
255255if (NOT MBED_IS_NATIVE_BUILD)
256256 file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} /generated -headers)
257257 mbed_write_target_config_header(${CMAKE_CURRENT_BINARY_DIR} /generated -headers/mbed-target -config.h MBED_TARGET_DEFINITIONS MBED_CONFIG_DEFINITIONS)
258- target_compile_options (mbed-core-flags INTERFACE -include ${CMAKE_CURRENT_BINARY_DIR} /generated -headers/mbed-target -config.h)
258+ # Scope preincluded target config to C/C++ only to avoid leaking into ASM builds
259+ # Use a single OR-ed generator expression and avoid semicolons to prevent
260+ # creation of an empty "-include" argument.
261+ target_compile_options (mbed-core-flags INTERFACE
262+ $<$<OR :$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-include ${CMAKE_CURRENT_BINARY_DIR} /generated -headers/mbed-target -config.h>
263+ )
259264 target_include_directories (mbed-core-flags INTERFACE ${CMAKE_CURRENT_BINARY_DIR} /generated -headers)
260265endif ()
261266
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ static void setupSWOForPrint(void)
6969 Actual divider is TPI->ACPR + 1. */
7070 uint32_t freq = CMU_ClockFreqGet (cmuClock_DBG ) + (875000 / 2 );
7171 uint32_t div = freq / 875000 ;
72- TPI -> ACPR = div - 1 ;
72+ TPIU -> ACPR = div - 1 ;
7373}
7474
7575static bool swoIsInitd ()
You can’t perform that action at this time.
0 commit comments