|
@@ -21,8 +21,10 @@ mcu_startup_files = {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
# Check each defined MCU, match the platform and append the appropriate startup file
|
|
# Check each defined MCU, match the platform and append the appropriate startup file
|
|
|
|
|
+cpp_defines_tuple = env.get('CPPDEFINES', [])
|
|
|
|
|
+cpp_defines_list = [item[0] if isinstance(item, tuple) else item for item in cpp_defines_tuple]
|
|
|
for mcu, startup_file in mcu_startup_files.items():
|
|
for mcu, startup_file in mcu_startup_files.items():
|
|
|
- if mcu in env.get('CPPDEFINES', []):
|
|
|
|
|
|
|
+ if mcu in cpp_defines_list:
|
|
|
if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
|
|
if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
|
|
|
src += [os.path.join(cwd, 'Source', 'Templates', 'gcc', startup_file)]
|
|
src += [os.path.join(cwd, 'Source', 'Templates', 'gcc', startup_file)]
|
|
|
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
|
|
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
|
|
@@ -35,4 +37,4 @@ for mcu, startup_file in mcu_startup_files.items():
|
|
|
group = DefineGroup('STM32WL-CMSIS', src, depend=['PKG_USING_STM32WL_CMSIS_DRIVER'], CPPPATH=path)
|
|
group = DefineGroup('STM32WL-CMSIS', src, depend=['PKG_USING_STM32WL_CMSIS_DRIVER'], CPPPATH=path)
|
|
|
|
|
|
|
|
# Return the build group
|
|
# Return the build group
|
|
|
-Return('group')
|
|
|
|
|
|
|
+Return('group')
|