Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
9e5ed8e60d
215 changed files with 3 additions and 73516 deletions
|
|
@ -898,9 +898,6 @@ def arm_processor_rules(info_data, rules):
|
|||
info_data['platform'] = 'STM32'
|
||||
elif 'MCU_SERIES' in rules:
|
||||
info_data['platform'] = rules['MCU_SERIES']
|
||||
elif 'ARM_ATSAM' in rules:
|
||||
info_data['platform'] = 'ARM_ATSAM'
|
||||
info_data['platform_key'] = 'arm_atsam'
|
||||
|
||||
return info_data
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue