Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ mcu_startup_files = {
}

# 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():
if mcu in env.get('CPPDEFINES', []):
if mcu in cpp_defines_list:
if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
src += [os.path.join(cwd, 'Source', 'Templates', 'gcc', startup_file)]
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
Expand All @@ -53,4 +55,4 @@ for mcu, startup_file in mcu_startup_files.items():
group = DefineGroup('STM32F4-CMSIS', src, depend=['PKG_USING_STM32F4_CMSIS_DRIVER'], CPPPATH=path)

# Return the build group
Return('group')
Return('group')