Anders Blomdell
Clone of official tools
Revision 41:2a77626a4c21, committed 2017-10-25
- Comitter:
- theotherjimmy
- Date:
- Wed Oct 25 14:46:50 2017 -0500
- Parent:
- 40:7d3fa6b99b2b
- Child:
- 42:2cf3f29fece1
- Commit message:
- Update to track Mbed OS 5.6.3
Changed in this revision
--- a/build_api.py Tue Oct 10 16:56:30 2017 -0500
+++ b/build_api.py Wed Oct 25 14:46:50 2017 -0500
@@ -439,6 +439,18 @@
# Set the toolchain's configuration data
toolchain.set_config_data(toolchain.config.get_config_data())
+ if (hasattr(toolchain.target, "release_versions") and
+ "5" not in toolchain.target.release_versions and
+ "rtos" in toolchain.config.lib_config_data):
+ if "Cortex-A" in toolchain.target.core:
+ raise NotSupportedException(
+ ("%s Will be supported in mbed OS 5.6. "
+ "To use the %s, please checkout the mbed OS 5.4 release branch. "
+ "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
+ "for more information") % (toolchain.target.name, toolchain.target.name))
+ else:
+ raise NotSupportedException("Target does not support mbed OS 5")
+
return resources
def build_project(src_paths, build_path, target, toolchain_name,
@@ -559,17 +571,6 @@
try:
# Call unified scan_resources
resources = scan_resources(src_paths, toolchain, inc_dirs=inc_dirs)
- if (hasattr(toolchain.target, "release_versions") and
- "5" not in toolchain.target.release_versions and
- "rtos" in toolchain.config.lib_config_data):
- if "Cortex-A" in toolchain.target.core:
- raise NotSupportedException(
- ("%s Will be supported in mbed OS 5.6. "
- "To use the %s, please checkout the mbed OS 5.4 release branch. "
- "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
- "for more information") % (toolchain.target.name, toolchain.target.name))
- else:
- raise NotSupportedException("Target does not support mbed OS 5")
# Change linker script if specified
if linker_script is not None:
--- a/detect_targets.py Tue Oct 10 16:56:30 2017 -0500
+++ b/detect_targets.py Wed Oct 25 14:46:50 2017 -0500
@@ -31,8 +31,13 @@
# Imports related to mbed build api
from tools.build_api import mcu_toolchain_matrix
from tools.test_api import get_autodetected_MUTS_list
+from tools.test_api import get_module_avail
from argparse import ArgumentParser
+try:
+ import mbed_lstools
+except:
+ pass
def main():
"""Entry Point"""
@@ -75,15 +80,17 @@
count = 0
for mut in muts.values():
if re.match(mcu_filter, mut['mcu']):
+ interface_version = get_interface_version(mut['disk'])
print ""
- print "[mbed] Detected %s, port %s, mounted %s" % \
- (mut['mcu'], mut['port'], mut['disk'])
+ print "[mbed] Detected %s, port %s, mounted %s, interface version %s:" % \
+ (mut['mcu'], mut['port'], mut['disk'], interface_version)
+
print "[mbed] Supported toolchains for %s" % mut['mcu']
print mcu_toolchain_matrix(platform_filter=mut['mcu'])
count += 1
if count == 0:
- print "[mbed] No mbed targets where detected on your system."
+ print "[mbed] No mbed targets were detected on your system."
except KeyboardInterrupt:
print "\n[CTRL+c] exit"
@@ -92,6 +99,32 @@
traceback.print_exc(file=sys.stdout)
print "[ERROR] %s" % str(exc)
sys.exit(1)
+
+def get_interface_version(mount_point):
+ """ Function returns interface version from the target mounted on the specified mount point
+
+ mount_point can be acquired via the following:
+ muts = get_autodetected_MUTS_list()
+ for mut in muts.values():
+ mount_point = mut['disk']
+
+ @param mount_point Name of disk where platform is connected to host machine.
+ """
+ if get_module_avail('mbed_lstools'):
+ try :
+ mbeds = mbed_lstools.create()
+ details_txt = mbeds.get_details_txt(mount_point)
+
+ if 'Interface Version' in details_txt:
+ return details_txt['Interface Version']
+
+ elif 'Version' in details_txt:
+ return details_txt['Version']
+
+ except :
+ return 'unknown'
+
+ return 'unknown'
if __name__ == '__main__':
main()
--- a/export/ds5_5/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/export/ds5_5/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -29,6 +29,7 @@
'UBLOX_C027',
'ARCH_PRO',
'RZ_A1H',
+ 'VK_RZ_A1H',
]
USING_MICROLIB = [
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/export/e2studio/.cproject.tmpl Wed Oct 25 14:46:50 2017 -0500
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+<!-- Generated by the GNU ARM Eclipse exporter from an mBed project. -->
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+ <storageModule moduleId="org.eclipse.cdt.core.settings">
+ {% for cfg_key in options %}
+ {% set opts = options[cfg_key] %}
+ <cconfiguration id="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}" moduleId="org.eclipse.cdt.core.settings" name="{{opts['name']}}">
+ <externalSettings/>
+ <extensions>
+ <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+ <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ </extensions>
+ </storageModule>
+ <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.{{opts['parent_id']}}" cleanCommand="${cross_rm} -rf" description="" id="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}" name="{{opts['name']}}" parent="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['parent_id']}}">
+ <folderInfo id="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}." name="/" resourcePath="">
+ <toolChain id="com.renesas.cdt.managedbuild.gnuarm.toolchain.elf.{{opts['id']}}.{{u.id}}" name="GCC ARM Embedded" superClass="com.renesas.cdt.managedbuild.gnuarm.toolchain.elf.{{opts['parent_id']}}">
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.{{u.id}}" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.{{opts['common']['arm.target.family']}}" valueType="enumerated"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.arch.{{opts['common']['arm.target.arch']}}" valueType="enumerated"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.{{u.id}}" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.{{opts['common']['arm.target.instructionset']}}" valueType="enumerated"/>
+ {% if opts['common']['arm.target.thumbinterwork'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.thumbinterwork.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.thumbinterwork" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['arm.target.endianness'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.endianness.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.endianness" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.endianness.{{opts['common']['arm.target.endianness']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['arm.target.fpu.abi'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.{{u.id}}" name="Float ABI" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.{{opts['common']['arm.target.fpu.abi']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['arm.target.fpu.unit'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.{{u.id}}" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.{{opts['common']['arm.target.fpu.unit']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['arm.target.unalignedaccess'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.unalignedaccess.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.unalignedaccess" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.unalignedaccess.{{opts['common']['arm.target.unalignedaccess']}}" valueType="enumerated"/>
+ {% endif %}
+
+ {% if opts['common']['optimization.level'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.{{u.id}}" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.{{opts['common']['optimization.level']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['optimization.messagelength'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.{{u.id}}" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.signedchar'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.{{u.id}}" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.functionsections'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.{{u.id}}" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.datasections'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.{{u.id}}" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.nocommon'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nocommon.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nocommon" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.noinlinefunctions'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.noinlinefunctions.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.noinlinefunctions" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.freestanding'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.nobuiltin'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nobuiltin.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nobuiltin" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.spconstant'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.PIC'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.PIC.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.PIC" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.nomoveloopinvariants'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants.{{u.id}}" name="Disable loop invariant move (-fno-move-loop-invariants)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['optimization.other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other" value="{{opts['common']['optimization.other']}}" valueType="string"/>
+ {% endif %}
+
+ {% if opts['common']['warnings.syntaxonly'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.pedantic'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.pedanticerrors'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.nowarn'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.nowarn.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.nowarn" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.unused'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused.{{u.id}}" name="Warn on various unused elements (-Wunused)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.uninitialized'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized.{{u.id}}" name="Warn on uninitialized variables (-Wuninitialised)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.allwarn'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.{{u.id}}" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.extrawarn'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn.{{u.id}}" name="Enable extra warnings (-Wextra)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.missingdeclaration'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.missingdeclaration.{{u.id}}" name="Warn on undeclared global function (-Wmissing-declaration)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.missingdeclaration" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.conversion'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.conversion.{{u.id}}" name="Warn on implicit conversions (-Wconversion)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.conversion" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.pointerarith'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith.{{u.id}}" name="Warn if pointer arithmetic (-Wpointer-arith)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.padded'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded.{{u.id}}" name="Warn if padding is included (-Wpadded)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.shadow'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.shadow.{{u.id}}" name="Warn if shadowed variable (-Wshadow)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.shadow" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.logicalop'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop.{{u.id}}" name="Warn if suspicious logical ops (-Wlogical-op)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.agreggatereturn'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.agreggatereturn.{{u.id}}" name="Warn if struct is returned (-Wagreggate-return)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.agreggatereturn" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.floatequal'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal.{{u.id}}" name="Warn if floats are compared as equal (-Wfloat-equal)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['warnings.toerrors'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors" value="true" valueType="boolean"/>
+ {% endif %}
+
+ {% if opts['common']['warnings.other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.other.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.other" value="{{opts['common']['warnings.other']}}" valueType="string"/>
+ {% endif %}
+
+ {% if opts['common']['debugging.level'] != 'none' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.{{u.id}}" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.{{opts['common']['debugging.level']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['debugging.format'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.{{u.id}}" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format" value="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.{{opts['common']['debugging.format']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['common']['debugging.prof'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['common']['debugging.gprof'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof" value="true" valueType="boolean"/>
+ {% endif %}
+
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.{{u.id}}" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.{{u.id}}" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.{{u.id}}" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp" value="g++" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.{{u.id}}" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar" value="ar" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.{{u.id}}" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy" value="objcopy" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.{{u.id}}" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump" value="objdump" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.{{u.id}}" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size" value="size" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.{{u.id}}" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make" value="make" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.{{u.id}}" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" value="rm" valueType="string"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.{{u.id}}" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" value="true" valueType="boolean"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.{{u.id}}" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" value="true" valueType="boolean"/>
+ <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.{{u.id}}" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
+ <builder buildPath="${workspace_loc:/{{name}}}/BUILD/{{opts['name']}}" cleanBuildTarget="mbedclean" id="ilg.gnuarmeclipse.managedbuild.cross.builder.{{u.id}}" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.{{u.id}}" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
+ {% if opts['as']['usepreprocessor'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.{{u.id}}" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['as']['nostdinc'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.nostdinc.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.nostdinc" value="true" valueType="boolean"/>
+ {% endif %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.{{u.id}}" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
+ {% for path in opts['common']['include_paths'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{path}}""/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+ {% for s in opts['as']['defines'] %}
+ <listOptionValue builtIn="false" value='{{s|replace("\"", "\\\"")|escape}}' />
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.files.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.files" useByScannerDiscovery="true" valueType="includeFiles">
+ {% for file in opts['common']['include_files'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{file}}""/>
+ {% endfor %}
+ </option>
+ {% if opts['as']['otherwarnings'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.otherwarnings.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.otherwarnings" value="{{opts['as']['otherwarnings']}}" valueType="string"/>
+ {% endif %}
+ {% if opts['as']['verbose'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.verbose.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.verbose" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['as']['other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.other.{{u.id}}" name="Other assembler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.other" value="{{opts['as']['other']}}" valueType="string"/>
+ {% endif %}
+ <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
+ </tool>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.{{opts['uid']['tool_c_compiler']}}" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
+ {% if opts['c']['nostdinc'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.nostdinc.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.nostdinc" value="true" valueType="boolean"/>
+ {% endif %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.{{u.id}}" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
+ {% for path in opts['common']['include_paths'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{path}}""/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+ {% for s in opts['c']['defines'] %}
+ <listOptionValue builtIn="false" value='{{s|replace("\"", "\\\"")|escape}}'/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.{{u.id}}" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">
+ {% for file in opts['common']['include_files'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{file}}""/>
+ {% endfor %}
+ </option>
+ {% if opts['c']['compiler.std'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.{{opts['c']['compiler.std']}}" valueType="enumerated"/>
+ {% endif %}
+ {% if opts['c']['otheroptimizations'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.otheroptimizations.{{u.id}}" name="Other optimization flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.otheroptimizations" useByScannerDiscovery="true" value="{{opts['c']['otheroptimizations']}}" valueType="string"/>
+ {% endif %}
+ {% if opts['c']['warnings.missingprototypes'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.missingprototypes.{{u.id}}" name="Warn if a global function has no prototype (-Wmissing-prototypes)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.missingprototypes" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['c']['warnings.strictprototypes'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.strictprototypes.{{u.id}}" name="Warn if a function has no arg type (-Wstrict-prototypes)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.strictprototypes" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['c']['warnings.badfunctioncast'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.badfunctioncast.{{u.id}}" name="Warn if wrong cast (-Wbad-function-cast)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.warning.badfunctioncast" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['c']['otherwarnings'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.otherwarnings.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.otherwarnings" value="{{opts['c']['otherwarnings']}}" valueType="string"/>
+ {% endif %}
+ {% if opts['c']['verbose'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.verbose.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.verbose" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['c']['other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" value="{{opts['c']['other']}}" valueType="string"/>
+ {% endif %}
+ <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.{{opts['uid']['tool_c_compiler_input']}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
+ </tool>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.{{opts['uid']['tool_cpp_compiler']}}" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
+ {% if opts['cpp']['nostdinc'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nostdinc.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nostdinc" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['nostdincpp'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nostdincpp.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nostdincpp" value="true" valueType="boolean"/>
+ {% endif %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.{{u.id}}" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
+ {% for path in opts['common']['include_paths'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{path}}""/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+ {% for s in opts['cpp']['defines'] %}
+ <listOptionValue builtIn="false" value='{{s|replace("\"", "\\\"")|escape}}'/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.files.{{u.id}}" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">
+ {% for file in opts['common']['include_files'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{file}}""/>
+ {% endfor %}
+ </option>
+ {% if opts['cpp']['compiler.std'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.{{opts['cpp']['compiler.std']}}" valueType="enumerated"/>
+ {% endif %}
+
+ {% if opts['cpp']['optimization.noexceptions'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.noexceptions.{{u.id}}" name="Do not use exceptions (-fno-exceptions)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.noexceptions" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['optimization.nortti'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nortti.{{u.id}}" name="Do not use RTTI (-fno-rtti)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nortti" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['optimization.nousecxaatexit'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nousecxaatexit.{{u.id}}" name="Do not use _cxa_atexit() (-fno-use-cxa-atexit)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nousecxaatexit" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['optimization.nothreadsafestatics'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nothreadsafestatics.{{u.id}}" name="Do not use thread-safe statics (-fno-threadsafe-statics)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.nothreadsafestatics" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['otheroptimizations'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.otheroptimizations.{{u.id}}" name="Other optimization flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.otheroptimizations" useByScannerDiscovery="true" value="{{opts['cpp']['otheroptimizations']}}" valueType="string"/>
+ {% endif %}
+
+ {% if opts['cpp']['warnabi'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warnabi.{{u.id}}" name="Warn on ABI violations (-Wabi)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warnabi" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warnings.ctordtorprivacy'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.ctordtorprivacy.{{u.id}}" name="Warn on class privacy (-Wctor-dtor-privacy)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.ctordtorprivacy" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warnings.noexcept'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.noexcept.{{u.id}}" name="Warn on no-except expressions (-Wnoexcept)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.noexcept" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warnings.nonvirtualdtor'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.nonvirtualdtor.{{u.id}}" name="Warn on virtual destructors (-Wnon-virtual-dtor)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.nonvirtualdtor" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warnings.strictnullsentinel'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.strictnullsentinel.{{u.id}}" name="Warn on uncast NULL (-Wstrict-null-sentinel)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.strictnullsentinel" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warnings.signpromo'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.signpromo.{{u.id}}" name="Warn on sign promotion (-Wsign-promo)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warning.signpromo" useByScannerDiscovery="true" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['warneffc'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warneffc.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.warneffc" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['otherwarnings'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.otherwarnings.{{u.id}}" name="Other warning flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.otherwarnings" useByScannerDiscovery="true" value="{{opts['cpp']['otherwarnings']}}" valueType="string"/>
+ {% endif %}
+
+ {% if opts['cpp']['verbose'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.verbose.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.verbose" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['cpp']['other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.other.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.other" value="{{opts['cpp']['other']}}" valueType="string"/>
+ {% endif %}
+ <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.{{opts['uid']['tool_cpp_compiler_input']}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
+ </tool>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.{{u.id}}" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile.{{u.id}}" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile" valueType="stringList">
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{opts['ld']['script']}}""/>
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths.{{u.id}}" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths" valueType="libPaths">
+ {% for path in opts['ld']['library_paths'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{path}}""/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.libs.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.libs" valueType="libs">
+ {% for lib in opts['ld']['user_libraries'] %}
+ <listOptionValue builtIn="false" value="{{lib}}"/>
+ {% endfor %}
+ {% for lib in opts['ld']['system_libraries'] %}
+ <listOptionValue builtIn="false" value="{{lib}}"/>
+ {% endfor %}
+ </option>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.otherobjs.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.otherobjs" valueType="userObjs">
+ {% for path in opts['ld']['object_files'] %}
+ <listOptionValue builtIn="false" value=""${ProjDirPath}/{{path}}""/>
+ {% endfor %}
+ </option>
+ {% if opts['ld']['gcsections'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.{{u.id}}" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
+ {% endif %}
+
+ {% if opts['ld']['nostart'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart.{{u.id}}" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['ld']['nodeflibs'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nodeflibs.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nodeflibs" value="true" valueType="boolean"/>
+ {% endif %}
+ {% if opts['ld']['nostdlibs'] %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostdlibs.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostdlibs" value="true" valueType="boolean"/>
+ {% endif %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.flags.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.flags" valueType="stringList">
+ {% for opt in opts['ld']['flags'] %}
+ <listOptionValue builtIn="false" value="{{opt}}"/>
+ {% endfor %}
+ </option>
+
+ {% if opts['ld']['other'] != '' %}
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.other.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.other" value="{{opts['ld']['other']}}" valueType="string"/>
+ {% endif %}
+ <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
+ <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+ <additionalInput kind="additionalinput" paths="$(LIBS)"/>
+ </inputType>
+ </tool>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.{{u.id}}" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.{{u.id}}" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash">
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice" value="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.binary" valueType="enumerated"/>
+ </tool>
+
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.{{u.id}}" name="Cross ARM GNU Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.{{u.id}}" name="Display source (--source|-S)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" value="true" valueType="boolean"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders.{{u.id}}" name="Display all headers (--all-headers|-x)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders" value="true" valueType="boolean"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle.{{u.id}}" name="Demangle names (--demangle|-C)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle" value="true" valueType="boolean"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers.{{u.id}}" name="Display line numbers (--line-numbers|-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers" value="true" valueType="boolean"/>
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide.{{u.id}}" name="Wide lines (--wide|-w)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide" value="true" valueType="boolean"/>
+ </tool>
+ <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.{{u.id}}" name="Cross ARM GNU Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
+ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.{{u.id}}" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format"/>
+ </tool>
+ </toolChain>
+ </folderInfo>
+ <sourceEntries>
+ <entry excluding="{{opts['common']['excluded_folders']}}" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ </sourceEntries>
+ </configuration>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+ </cconfiguration>
+ {% endfor %}
+ </storageModule>
+ <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+ <project id="{{name}}_emb.com.renesas.cdt.managedbuild.gnuarm.target.elf.{{u.id}}" name="Executable" projectType="com.renesas.cdt.managedbuild.gnuarm.target.elf"/>
+ </storageModule>
+ <storageModule moduleId="scannerConfiguration">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ {% for cfg_key in options %}
+ {% set opts = options[cfg_key] %}
+ <scannerConfigBuildInfo instanceId="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}};com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}.;com.renesas.cdt.managedbuild.gnuarm.tool.cpp.compiler.{{opts['uid']['tool_cpp_compiler']}};com.renesas.cdt.managedbuild.gnuarm.tool.cpp.compiler.input.{{opts['uid']['tool_cpp_compiler_input']}}">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ {% endfor %}
+ {% for cfg_key in options %}
+ {% set opts = options[cfg_key] %}
+ <scannerConfigBuildInfo instanceId="com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}};com.renesas.cdt.managedbuild.gnuarm.config.elf.{{opts['id']}}.{{opts['uid']['config']}}.;com.renesas.cdt.managedbuild.gnuarm.tool.c.compiler.{{opts['uid']['tool_c_compiler']}};com.renesas.cdt.managedbuild.gnuarm.tool.c.compiler.input.{{opts['uid']['tool_c_compiler_input']}}">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ {% endfor %}
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
+</cproject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/export/e2studio/.gdbinit.tmpl Wed Oct 25 14:46:50 2017 -0500 @@ -0,0 +1,29 @@ +define hook-step +mon cortex_a maskisr on +end + +define hook-stepi +mon cortex_a maskisr on +end + +define hook-next +mon cortex_a maskisr on +end + +define hook-nexti +mon cortex_a maskisr on +end + +define hook-finish +mon cortex_a maskisr on +end + +define hook-stop +mon cortex_a maskisr off +end + +define hook-kill +mon reset init +end + +set mem inaccessible-by-default off \ No newline at end of file
--- a/export/e2studio/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/export/e2studio/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -14,35 +14,35 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
-from os.path import splitext, basename
+from tools.export.gnuarmeclipse import GNUARMEclipse
-from tools.export.exporters import Exporter, deprecated_exporter
-
-@deprecated_exporter
-class E2Studio(Exporter):
+class E2Studio(GNUARMEclipse):
NAME = 'e2 studio'
TOOLCHAIN = 'GCC_ARM'
TARGETS = [
'RZ_A1H',
+ 'VK_RZ_A1H',
]
+ # override
def generate(self):
- libraries = []
- for lib in self.resources.libraries:
- l, _ = splitext(basename(lib))
- libraries.append(l[3:])
+
+ jinja_ctx = self.collect_tmpl_vars()
+
+ print
+ print 'Create a e2 studio C++ managed project'
+ print 'Project name: {0}'.format(self.project_name)
+ print 'Target: {0}'.format(self.toolchain.target.name)
+ print 'Toolchain: {0}'.format(self.TOOLCHAIN)
- ctx = {
- 'name': self.project_name,
- 'include_paths': self.resources.inc_dirs,
- 'linker_script': self.resources.linker_script,
-
- 'object_files': self.resources.objects,
- 'libraries': libraries,
- 'symbols': self.toolchain.get_symbols()
- }
- self.gen_file('e2studio/%s_project.tmpl' % self.target.lower(), ctx, '.project')
- self.gen_file('e2studio/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
- self.gen_file('e2studio/%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit')
- self.gen_file('e2studio/launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name)
+ self.gen_file('e2studio/.cproject.tmpl', jinja_ctx, '.cproject', trim_blocks=True, lstrip_blocks=True)
+ self.gen_file('e2studio/.gdbinit.tmpl', jinja_ctx, '.gdbinit')
+ self.gen_file('e2studio/launch.tmpl', jinja_ctx, '%s OpenOCD.launch' % self.project_name, trim_blocks=True, lstrip_blocks=True)
+
+ self.gen_file('gnuarmeclipse/.project.tmpl', jinja_ctx, '.project', trim_blocks=True, lstrip_blocks=True)
+ self.gen_file('gnuarmeclipse/mbedignore.tmpl', jinja_ctx, '.mbedignore')
+ self.gen_file('gnuarmeclipse/makefile.targets.tmpl', jinja_ctx, 'makefile.targets', trim_blocks=True, lstrip_blocks=True)
+
+ print
+ print 'Done. Import the project located at \'{0}\' in e2 studio.'.format(self.project_name)
--- a/export/gnuarmeclipse/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/export/gnuarmeclipse/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -126,19 +126,13 @@
flags['cxx_flags'] += header_options
return flags
- # override
- def generate(self):
- """
- Generate the .project and .cproject files.
- """
+ def validate_resources(self):
if not self.resources.linker_script:
raise NotSupportedException("No linker script found.")
- print
- print 'Create a GNU ARM Eclipse C++ managed project'
- print 'Project name: {0}'.format(self.project_name)
- print 'Target: {0}'.format(self.toolchain.target.name)
- print 'Toolchain: {0}'.format(self.TOOLCHAIN)
+ def create_jinja_ctx(self):
+
+ self.validate_resources()
self.resources.win_to_unix()
@@ -250,7 +244,7 @@
opts['ld']['system_libraries'] = self.system_libraries
opts['ld']['script'] = join(id.capitalize(),
"linker-script-%s.ld" % id)
- opts['cpp_cmd'] = " ".join(toolchain.preproc)
+ opts['cpp_cmd'] = '"{}"'.format(toolchain.preproc[0]) + " " + " ".join(toolchain.preproc[1:])
# Unique IDs used in multiple places.
# Those used only once are implemented with {{u.id}}.
@@ -276,6 +270,20 @@
# will be called repeatedly, to generate multiple UIDs.
'u': u,
}
+ return jinja_ctx
+
+ # override
+ def generate(self):
+ """
+ Generate the .project and .cproject files.
+ """
+ jinja_ctx = self.create_jinja_ctx()
+
+ print
+ print 'Create a GNU ARM Eclipse C++ managed project'
+ print 'Project name: {0}'.format(self.project_name)
+ print 'Target: {0}'.format(self.toolchain.target.name)
+ print 'Toolchain: {0}'.format(self.TOOLCHAIN)
self.gen_file('gnuarmeclipse/.project.tmpl', jinja_ctx,
'.project', trim_blocks=True, lstrip_blocks=True)
--- a/export/iar/iar_definitions.json Tue Oct 10 16:56:30 2017 -0500
+++ b/export/iar/iar_definitions.json Wed Oct 25 14:46:50 2017 -0500
@@ -23,6 +23,12 @@
"STM32L476RG": {
"OGChipSelectEditMenu": "STM32L476RG\tST STM32L476RG"
},
+ "STM32L486RG": {
+ "OGChipSelectEditMenu": "STM32L486RG\tST STM32L486RG"
+ },
+ "STM32L476JG": {
+ "OGChipSelectEditMenu": "STM32L476JG\tST STM32L476JG"
+ },
"STM32L011K4": {
"OGChipSelectEditMenu": "STM32L011x4\tST STM32L011x4"
},
@@ -68,8 +74,8 @@
"LPC54114J256BD64": {
"OGChipSelectEditMenu": "LPC54114J256_M4\tNXP LPC54114J256_M4"
},
- "LPC54608J512ET180": {
- "OGChipSelectEditMenu": "LPC54608J512\tNXP LPC54608J512"
+ "LPC54618J512ET180": {
+ "OGChipSelectEditMenu": "LPC54618J512\tNXP LPC54618J512"
},
"STM32F072RB": {
"OGChipSelectEditMenu": "STM32F072RB\tST STM32F072RB"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/export/mcuxpresso/LPC546XX_cproject.tmpl Wed Oct 25 14:46:50 2017 -0500
@@ -0,0 +1,106 @@
+{% extends "mcuxpresso/.cproject.tmpl" %}
+
+{% block cpu_config %}<?xml version="1.0" encoding="UTF-8"?>
+<TargetConfig>
+<Properties property_3="NXP" property_4="LPC54608J512" property_count="5" version="70200"/>
+<infoList vendor="NXP"><info chip="LPC54608J512" name="LPC54608J512"><chip><name>LPC54608J512</name>
+<family>LPC546xx</family>
+<vendor>NXP</vendor>
+<memory can_program="true" id="Flash" is_ro="true" size="512" type="Flash"/>
+<memory id="RAM" size="200" type="RAM"/>
+<memoryInstance derived_from="Flash" driver="LPC5460x_512K.cfx" id="PROGRAM_FLASH" location="0x0" size="0x80000"/>
+<memoryInstance derived_from="RAM" id="SRAM_0_1_2_3" location="0x20000000" size="0x28000"/>
+<memoryInstance derived_from="RAM" id="SRAMX" location="0x4000000" size="0x8000"/>
+<memoryInstance derived_from="RAM" id="USB_RAM" location="0x40100000" size="0x2000"/>
+<peripheralInstance derived_from="SYSCON" id="SYSCON" location="0x40000000"/>
+<peripheralInstance derived_from="IOCON" id="IOCON" location="0x40001000"/>
+<peripheralInstance derived_from="GINT0" id="GINT0" location="0x40002000"/>
+<peripheralInstance derived_from="GINT1" id="GINT1" location="0x40003000"/>
+<peripheralInstance derived_from="PINT" id="PINT" location="0x40004000"/>
+<peripheralInstance derived_from="INPUTMUX" id="INPUTMUX" location="0x40005000"/>
+<peripheralInstance derived_from="CTIMER0" id="CTIMER0" location="0x40008000"/>
+<peripheralInstance derived_from="CTIMER1" id="CTIMER1" location="0x40009000"/>
+<peripheralInstance derived_from="CTIMER2" id="CTIMER2" location="0x40028000"/>
+<peripheralInstance derived_from="CTIMER3" id="CTIMER3" location="0x40048000"/>
+<peripheralInstance derived_from="CTIMER4" id="CTIMER4" location="0x40049000"/>
+<peripheralInstance derived_from="WWDT" id="WWDT" location="0x4000C000"/>
+<peripheralInstance derived_from="MRT0" id="MRT0" location="0x4000D000"/>
+<peripheralInstance derived_from="UTICK0" id="UTICK0" location="0x4000E000"/>
+<peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x40014000"/>
+<peripheralInstance derived_from="OTPC" id="OTPC" location="0x40015000"/>
+<peripheralInstance derived_from="RTC" id="RTC" location="0x4002C000"/>
+<peripheralInstance derived_from="RIT" id="RIT" location="0x4002D000"/>
+<peripheralInstance derived_from="FMC" id="FMC" location="0x40034000"/>
+<peripheralInstance derived_from="SMARTCARD0" id="SMARTCARD0" location="0x40036000"/>
+<peripheralInstance derived_from="SMARTCARD1" id="SMARTCARD1" location="0x40037000"/>
+<peripheralInstance derived_from="ASYNC_SYSCON" id="ASYNC_SYSCON" location="0x40040000"/>
+<peripheralInstance derived_from="SPIFI0" id="SPIFI0" location="0x40080000"/>
+<peripheralInstance derived_from="EMC" id="EMC" location="0x40081000"/>
+<peripheralInstance derived_from="DMA0" id="DMA0" location="0x40082000"/>
+<peripheralInstance derived_from="LCD" id="LCD" location="0x40083000"/>
+<peripheralInstance derived_from="USB0" id="USB0" location="0x40084000"/>
+<peripheralInstance derived_from="SCT0" id="SCT0" location="0x40085000"/>
+<peripheralInstance derived_from="SPI0" id="SPI0" location="0x40086000"/>
+<peripheralInstance derived_from="SPI1" id="SPI1" location="0x40087000"/>
+<peripheralInstance derived_from="SPI2" id="SPI2" location="0x40088000"/>
+<peripheralInstance derived_from="SPI3" id="SPI3" location="0x40089000"/>
+<peripheralInstance derived_from="SPI4" id="SPI4" location="0x4008A000"/>
+<peripheralInstance derived_from="SPI5" id="SPI5" location="0x40096000"/>
+<peripheralInstance derived_from="SPI6" id="SPI6" location="0x40097000"/>
+<peripheralInstance derived_from="SPI7" id="SPI7" location="0x40098000"/>
+<peripheralInstance derived_from="SPI8" id="SPI8" location="0x40099000"/>
+<peripheralInstance derived_from="SPI9" id="SPI9" location="0x4009A000"/>
+<peripheralInstance derived_from="FLEXCOMM0" id="FLEXCOMM0" location="0x40086000"/>
+<peripheralInstance derived_from="FLEXCOMM1" id="FLEXCOMM1" location="0x40087000"/>
+<peripheralInstance derived_from="FLEXCOMM2" id="FLEXCOMM2" location="0x40088000"/>
+<peripheralInstance derived_from="FLEXCOMM3" id="FLEXCOMM3" location="0x40089000"/>
+<peripheralInstance derived_from="FLEXCOMM4" id="FLEXCOMM4" location="0x4008A000"/>
+<peripheralInstance derived_from="FLEXCOMM5" id="FLEXCOMM5" location="0x40096000"/>
+<peripheralInstance derived_from="FLEXCOMM6" id="FLEXCOMM6" location="0x40097000"/>
+<peripheralInstance derived_from="FLEXCOMM7" id="FLEXCOMM7" location="0x40098000"/>
+<peripheralInstance derived_from="FLEXCOMM8" id="FLEXCOMM8" location="0x40099000"/>
+<peripheralInstance derived_from="FLEXCOMM9" id="FLEXCOMM9" location="0x4009A000"/>
+<peripheralInstance derived_from="I2C0" id="I2C0" location="0x40086000"/>
+<peripheralInstance derived_from="I2C1" id="I2C1" location="0x40087000"/>
+<peripheralInstance derived_from="I2C2" id="I2C2" location="0x40088000"/>
+<peripheralInstance derived_from="I2C3" id="I2C3" location="0x40089000"/>
+<peripheralInstance derived_from="I2C4" id="I2C4" location="0x4008A000"/>
+<peripheralInstance derived_from="I2C5" id="I2C5" location="0x40096000"/>
+<peripheralInstance derived_from="I2C6" id="I2C6" location="0x40097000"/>
+<peripheralInstance derived_from="I2C7" id="I2C7" location="0x40098000"/>
+<peripheralInstance derived_from="I2C8" id="I2C8" location="0x40099000"/>
+<peripheralInstance derived_from="I2C9" id="I2C9" location="0x4009A000"/>
+<peripheralInstance derived_from="USART0" id="USART0" location="0x40086000"/>
+<peripheralInstance derived_from="USART1" id="USART1" location="0x40087000"/>
+<peripheralInstance derived_from="USART2" id="USART2" location="0x40088000"/>
+<peripheralInstance derived_from="USART3" id="USART3" location="0x40089000"/>
+<peripheralInstance derived_from="USART4" id="USART4" location="0x4008A000"/>
+<peripheralInstance derived_from="USART5" id="USART5" location="0x40096000"/>
+<peripheralInstance derived_from="USART6" id="USART6" location="0x40097000"/>
+<peripheralInstance derived_from="USART7" id="USART7" location="0x40098000"/>
+<peripheralInstance derived_from="USART8" id="USART8" location="0x40099000"/>
+<peripheralInstance derived_from="USART9" id="USART9" location="0x4009A000"/>
+<peripheralInstance derived_from="GPIO" id="GPIO" location="0x4008C000"/>
+<peripheralInstance derived_from="DMIC0" id="DMIC0" location="0x40090000"/>
+<peripheralInstance derived_from="ENET" id="ENET" location="0x40092000"/>
+<peripheralInstance derived_from="USBHSD" id="USBHSD" location="0x40094000"/>
+<peripheralInstance derived_from="CRC_ENGINE" id="CRC_ENGINE" location="0x40095000"/>
+<peripheralInstance derived_from="I2S0" id="I2S0" location="0x40097000"/>
+<peripheralInstance derived_from="I2S1" id="I2S1" location="0x40098000"/>
+<peripheralInstance derived_from="SDIF" id="SDIF" location="0x4009B000"/>
+<peripheralInstance derived_from="CAN0" id="CAN0" location="0x4009D000"/>
+<peripheralInstance derived_from="CAN1" id="CAN1" location="0x4009E000"/>
+<peripheralInstance derived_from="ADC0" id="ADC0" location="0x400A0000"/>
+<peripheralInstance derived_from="USBFSH" id="USBFSH" location="0x400A2000"/>
+<peripheralInstance derived_from="USBHSH" id="USBHSH" location="0x400A3000"/>
+</chip>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
+<family>Cortex-M</family>
+</processor>
+<link href="LPC54608_internal_peripheral.xml" show="embed" type="simple"/>
+</info>
+</infoList>
+</TargetConfig>{% endblock %}
+
+{% block sdk_name %}SDK_2.x_LPCXpresso54608{% endblock %}
+{% block sdk_version %}2.2.0{% endblock %}
--- a/export/sw4stm32/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/export/sw4stm32/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -249,6 +249,11 @@
'name': 'NUCLEO-L476RG',
'mcuId': 'STM32L476RGTx'
},
+ 'NUCLEO_L486RG':
+ {
+ 'name': 'NUCLEO-L486RG',
+ 'mcuId': 'STM32L486RGTx'
+ },
}
TARGETS = BOARDS.keys()
--- a/export/uvision/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/export/uvision/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -222,7 +222,8 @@
'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'),
'device': DeviceUvision(self.target),
}
- self.generated_files.append(ctx['linker_script'])
+ if ctx['linker_script'] is not self.resources.linker_script:
+ self.generated_files.append(ctx['linker_script'])
core = ctx['device'].core
ctx['cputype'] = core.rstrip("FD")
if core.endswith("FD"):
--- a/latest_targets.json Tue Oct 10 16:56:30 2017 -0500
+++ b/latest_targets.json Wed Oct 25 14:46:50 2017 -0500
@@ -241,7 +241,8 @@
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SEMIHOST", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "FLASH"],
"release_versions": ["2", "5"],
"features": ["LWIP"],
- "device_name": "LPC1768"
+ "device_name": "LPC1768",
+ "bootloader_supported": true
},
"ARCH_PRO": {
"supported_form_factors": ["ARDUINO"],
@@ -253,7 +254,8 @@
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "FLASH"],
"release_versions": ["2", "5"],
"features": ["LWIP"],
- "device_name": "LPC1768"
+ "device_name": "LPC1768",
+ "bootloader_supported": true
},
"UBLOX_C027": {
"supported_form_factors": ["ARDUINO"],
@@ -277,7 +279,8 @@
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "FLASH"],
"release_versions": ["2", "5"],
"features": ["LWIP"],
- "device_name": "LPC1768"
+ "device_name": "LPC1768",
+ "bootloader_supported": true
},
"XBED_LPC1768": {
"inherits": ["LPCTarget"],
@@ -646,10 +649,11 @@
"macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
"inherits": ["Target"],
"detect_code": ["0311"],
- "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"],
+ "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG", "FLASH"],
"features": ["LWIP"],
"release_versions": ["2", "5"],
- "device_name": "MK66FN2M0xxx18"
+ "device_name": "MK66FN2M0xxx18",
+ "bootloader_supported": true
},
"K82F": {
"supported_form_factors": ["ARDUINO"],
@@ -690,18 +694,18 @@
"release_versions": ["2", "5"],
"device_name" : "LPC54114J256BD64"
},
- "LPC54608": {
+ "LPC546XX": {
"supported_form_factors": ["ARDUINO"],
"core": "Cortex-M4F",
"supported_toolchains": ["ARM", "IAR", "GCC_ARM"],
- "extra_labels": ["NXP", "MCUXpresso_MCUS", "LPC54608", "LPCXpresso"],
+ "extra_labels": ["NXP", "MCUXpresso_MCUS", "LPCXpresso"],
"is_disk_virtual": true,
- "macros": ["CPU_LPC54608J512ET180", "FSL_RTOS_MBED"],
+ "macros": ["CPU_LPC54618J512ET180", "FSL_RTOS_MBED"],
"inherits": ["Target"],
"detect_code": ["1056"],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"release_versions": ["2", "5"],
- "device_name" : "LPC54608J512ET180"
+ "device_name" : "LPC54618J512ET180"
},
"NUCLEO_F030R8": {
"inherits": ["FAMILY_STM32"],
@@ -711,7 +715,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -770,7 +774,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -788,7 +792,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -806,7 +810,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -824,7 +828,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC (SYSCLK=72 MHz) | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI (SYSCLK=64 MHz)",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
},
"clock_source_usb": {
@@ -851,7 +855,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -870,7 +874,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -907,7 +911,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -924,7 +928,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -941,7 +945,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -959,7 +963,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -977,7 +981,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -995,7 +999,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
},
"clock_source_usb": {
@@ -1017,7 +1021,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1036,7 +1040,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1071,7 +1075,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
},
"clock_source_usb": {
@@ -1101,7 +1105,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
},
"clock_source_usb": {
@@ -1127,7 +1131,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1135,7 +1139,8 @@
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "SERIAL_FC", "FLASH"],
"release_versions": ["2", "5"],
- "device_name": "STM32F446RE"
+ "device_name": "STM32F446RE",
+ "bootloader_supported": true
},
"NUCLEO_F446ZE": {
"inherits": ["FAMILY_STM32"],
@@ -1145,7 +1150,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1177,7 +1182,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1201,7 +1206,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1225,7 +1230,7 @@
},
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1247,7 +1252,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1284,7 +1289,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1302,7 +1307,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1319,7 +1324,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1364,6 +1369,24 @@
"device_name": "STM32L476RG",
"bootloader_supported": true
},
+ "SILICA_SENSOR_NODE": {
+ "inherits": ["FAMILY_STM32"],
+ "core": "Cortex-M4F",
+ "default_toolchain": "GCC_ARM",
+ "extra_labels_add": ["STM32L4", "STM32L476xG", "STM32L476JG"],
+ "config": {
+ "clock_source": {
+ "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI | USE_PLL_MSI",
+ "value": "USE_PLL_MSI",
+ "macro_name": "CLOCK_SOURCE"
+ }
+ },
+ "detect_code": ["0766"],
+ "macros_add": ["USBHOST_OTHER"],
+ "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH"],
+ "release_versions": ["5"],
+ "device_name": "STM32L476JG"
+ },
"NUCLEO_L486RG": {
"inherits": ["FAMILY_STM32"],
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -1401,7 +1424,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1434,7 +1457,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1459,7 +1482,7 @@
"extra_labels_add": ["STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xI", "STM32F429xx"],
"config": {
"clock_source": {
- "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
+ "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
},
@@ -1481,12 +1504,13 @@
"extra_labels_add": ["STM32F4", "STM32F469", "STM32F469NI", "STM32F469xI", "STM32F469xx"],
"config": {
"clock_source": {
- "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
+ "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
"detect_code": ["0788"],
+ "macros_add": ["USB_STM_HAL"],
"device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_FC", "TRNG", "FLASH"],
"release_versions": ["2", "5"],
"device_name": "STM32F469NI"
@@ -1499,7 +1523,7 @@
"config": {
"clock_source": {
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
- "value": "USE_PLL_HSE_EXTC|USE_PLL_HSE_XTAL|USE_PLL_HSI",
+ "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE"
}
},
@@ -1700,7 +1724,22 @@
"features": ["LWIP"],
"release_versions": ["5"],
"device_name": "STM32F439ZI",
- "bootloader_supported": true
+ "bootloader_supported": true,
+ "config": {
+ "usb_tx": {
+ "help": "Value: D8(default) or D1",
+ "value": "D8"
+ },
+ "usb_rx": {
+ "help": "Value: D2(default) or D0",
+ "value": "D2"
+ },
+ "stdio_uart": {
+ "help": "Value: UART_1(default) or UART_3",
+ "value": "UART_1",
+ "macro_name": "STDIO_UART"
+ }
+ }
},
"UBLOX_C030": {
"inherits": ["FAMILY_STM32"],
@@ -1720,7 +1759,7 @@
"macro_name": "MODEM_ON_BOARD_UART"
}
},
- "macros_add": ["RTC_LSI=1", "HSE_VALUE=12000000", "GNSSBAUD=9600"],
+ "macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT", "RTC_LSI=1", "HSE_VALUE=12000000", "GNSSBAUD=9600"],
"device_has_add": ["ANALOGOUT", "SERIAL_FC", "TRNG", "FLASH"],
"features": ["LWIP"],
"public": false,
@@ -3006,6 +3045,7 @@
"inherits": ["Target"],
"core": "Cortex-M4F",
"macros": ["NRF52", "TARGET_NRF52832", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S132", "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"", "MBED_TICKLESS"],
+ "device_has": ["STCLK_OFF_DURING_SLEEP"],
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5", "SDK11", "NRF52_COMMON"],
"OUTPUT_EXT": "hex",
"is_disk_virtual": true,
@@ -3043,14 +3083,14 @@
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52"],
"macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"],
- "device_has": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
+ "device_has_add": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
"release_versions": ["2", "5"],
"device_name": "nRF52832_xxAA"
},
"UBLOX_EVA_NINA": {
"inherits": ["MCU_NRF52"],
"macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"],
- "device_has": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
+ "device_has_add": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
"release_versions": ["2", "5"],
"overrides": {"uart_hwfc": 0},
"device_name": "nRF52832_xxAA"
@@ -3059,7 +3099,7 @@
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52"],
"macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"],
- "device_has": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
+ "device_has_add": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
"release_versions": ["2", "5"],
"device_name": "nRF52832_xxAA"
},
@@ -3067,7 +3107,7 @@
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52"],
"macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"],
- "device_has": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
+ "device_has_add": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
"release_versions": ["2", "5"],
"overrides": {"lf_clock_src": "NRF_LF_SRC_RC"},
"config": {
@@ -3086,6 +3126,7 @@
"inherits": ["Target"],
"core": "Cortex-M4F",
"macros": ["TARGET_NRF52840", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S140", "NRF_SD_BLE_API_VERSION=5", "NRF52840_XXAA", "NRF_DFU_SETTINGS_VERSION=1", "NRF_SD_BLE_API_VERSION=5", "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
+ "device_has": ["STCLK_OFF_DURING_SLEEP"],
"extra_labels": ["NORDIC", "MCU_NRF52840", "NRF5", "SDK13", "NRF52_COMMON"],
"OUTPUT_EXT": "hex",
"is_disk_virtual": true,
@@ -3124,7 +3165,7 @@
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52840"],
"macros_add": ["BOARD_PCA10056", "CONFIG_GPIO_AS_PINRESET", "SWI_DISABLE0", "NRF52_ERRATA_20"],
- "device_has": ["FLASH", "ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "TRNG"],
+ "device_has_add": ["FLASH", "ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "TRNG"],
"release_versions": ["2", "5"],
"device_name": "nRF52840_xxAA"
},
@@ -3243,6 +3284,24 @@
"extra_labels": ["NUVOTON", "NANO100", "NANO130KE3BN"],
"is_disk_virtual": true,
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
+ "config": {
+ "gpio-irq-debounce-enable": {
+ "help": "Enable GPIO IRQ debounce",
+ "value": 0
+ },
+ "gpio-irq-debounce-enable-list": {
+ "help": "Comma separated pin list to enable GPIO IRQ debounce",
+ "value": "NC"
+ },
+ "gpio-irq-debounce-clock-source": {
+ "help": "Select GPIO IRQ debounce clock source: GPIO_DBCLKSRC_HCLK or GPIO_DBCLKSRC_IRC10K",
+ "value": "GPIO_DBCLKSRC_IRC10K"
+ },
+ "gpio-irq-debounce-sample-rate": {
+ "help": "Select GPIO IRQ debounce sample rate: GPIO_DBCLKSEL_1, GPIO_DBCLKSEL_2, GPIO_DBCLKSEL_4, ..., or GPIO_DBCLKSEL_32768",
+ "value": "GPIO_DBCLKSEL_16"
+ }
+ },
"inherits": ["Target"],
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH"],
--- a/memap.py Tue Oct 10 16:56:30 2017 -0500
+++ b/memap.py Wed Oct 25 14:46:50 2017 -0500
@@ -469,7 +469,6 @@
object_name = self.check_new_object_lib_iar(line)
if object_name and current_library:
- print("Replacing module", object_name, current_library)
temp = '[lib]' + '/'+ current_library + '/'+ object_name
self.module_replace(object_name, temp)
--- a/project.py Tue Oct 10 16:56:30 2017 -0500
+++ b/project.py Wed Oct 25 14:46:50 2017 -0500
@@ -20,6 +20,7 @@
from tools.utils import argparse_force_lowercase_type
from tools.utils import argparse_force_uppercase_type
from tools.utils import print_large_string
+from tools.utils import NotSupportedException
from tools.options import extract_profile, list_profiles, extract_mcus
from tools.build_profiles import find_targets_json, find_build_profile, get_toolchain_profile
from tools.toolchains import mbedToolchain
@@ -287,11 +288,13 @@
profile = extract_profile(parser, options, toolchain_name, fallback="debug")
if options.clean:
rmtree(BUILD_DIR)
- export(mcu, options.ide, build=options.build,
- src=options.source_dir, macros=options.macros,
- project_id=options.program, zip_proj=zip_proj,
- build_profile=profile, app_config=options.app_config)
-
+ try:
+ export(mcu, options.ide, build=options.build,
+ src=options.source_dir, macros=options.macros,
+ project_id=options.program, zip_proj=zip_proj,
+ build_profile=profile, app_config=options.app_config)
+ except NotSupportedException as exc:
+ print "[ERROR] %s" % str(exc)
if __name__ == "__main__":
main()
--- a/requirements.txt Tue Oct 10 16:56:30 2017 -0500 +++ b/requirements.txt Wed Oct 25 14:46:50 2017 -0500 @@ -3,11 +3,11 @@ PrettyTable>=0.7.2 Jinja2>=2.7.3 IntelHex>=1.3 -project-generator>=0.9.7,<0.10.0 -project-generator-definitions>=0.2.26,<0.3.0 junit-xml pyYAML requests mbed-ls>=0.2.13 -mbed-host-tests>=0.2.18 +mbed-host-tests>=1.1.2 mbed-greentea>=0.2.24 +beautifulsoup4>=4 +fuzzywuzzy>=0.11
--- a/targets/REALTEK_RTL8195AM.py Tue Oct 10 16:56:30 2017 -0500
+++ b/targets/REALTEK_RTL8195AM.py Wed Oct 25 14:46:50 2017 -0500
@@ -9,6 +9,7 @@
import shutil
from tools.paths import TOOLS_BOOTLOADERS
+from tools.toolchains import TOOLCHAIN_PATHS
from datetime import datetime
# Constant Variables
@@ -122,7 +123,8 @@
# LOAD 0x000034 0x10006000 0x10006000 0x026bc 0x026bc RW 0x8
# LOAD 0x0026f0 0x30000000 0x30000000 0x06338 0x06338 RWE 0x4
segment_list = []
- cmd = 'arm-none-eabi-readelf -l ' + image_elf
+ cmd = os.path.join(TOOLCHAIN_PATHS['GCC_ARM'], 'arm-none-eabi-readelf')
+ cmd = '"' + cmd + '"' + ' -l ' + image_elf
for line in subprocess.check_output(cmd, shell=True, universal_newlines=True).split("\n"):
if not line.startswith(" LOAD"):
continue
@@ -153,7 +155,8 @@
(offset, addr, size) = (0, 0, 0)
segment_list = []
in_segment = False
- cmd = 'fromelf --text -v --only=none ' + image_elf
+ cmd = os.path.join(TOOLCHAIN_PATHS['ARM'], 'bin', 'fromelf')
+ cmd = '"' + cmd + '"' + ' --text -v --only=none ' + image_elf
for line in subprocess.check_output(cmd, shell=True, universal_newlines=True).split("\n"):
if line == "":
pass
@@ -201,7 +204,8 @@
segment_list = []
in_segment = False
- cmd = 'ielfdumparm ' + image_elf
+ cmd = os.path.join(TOOLCHAIN_PATHS['IAR'], 'bin', 'ielfdumparm')
+ cmd = '"' + cmd + '"' + ' ' + image_elf
for line in subprocess.check_output(cmd, shell=True, universal_newlines=True).split("\n"):
if line.startswith(" SEGMENTS:"):
in_segment = True
--- a/test.py Tue Oct 10 16:56:30 2017 -0500
+++ b/test.py Wed Oct 25 14:46:50 2017 -0500
@@ -27,7 +27,8 @@
sys.path.insert(0, ROOT)
from tools.config import ConfigException
-from tools.test_api import test_path_to_name, find_tests, print_tests, build_tests, test_spec_from_test_builds
+from tools.test_api import test_path_to_name, find_tests, get_test_config, print_tests, build_tests, test_spec_from_test_builds
+import tools.test_configs as TestConfig
from tools.options import get_default_options_parser, extract_profile, extract_mcus
from tools.build_api import build_project, build_library
from tools.build_api import print_build_memory_usage
@@ -84,6 +85,9 @@
parser.add_argument("-n", "--names", dest="names", type=argparse_many(str),
default=None, help="Limit the tests to a comma separated list of names")
+ parser.add_argument("--test-config", dest="test_config", type=str,
+ default=None, help="Test config for a module")
+
parser.add_argument("--test-spec", dest="test_spec",
default=None, help="Destination path for a test spec file that can be used by the Greentea automated test tool")
@@ -133,10 +137,21 @@
"Currently set search path: %s"
% (toolchain, search_path))
+ # Assign config file. Precedence: test_config>app_config
+ # TODO: merge configs if both given
+ if options.test_config:
+ config = get_test_config(options.test_config, mcu)
+ if not config:
+ args_error(parser, "argument --test-config contains invalid path or identifier")
+ elif not options.app_config:
+ config = TestConfig.get_default_config(mcu)
+ else:
+ config = options.app_config
+
# Find all tests in the relevant paths
for path in all_paths:
all_tests.update(find_tests(path, mcu, toolchain,
- app_config=options.app_config))
+ app_config=config))
# Filter tests by name if specified
if options.names:
@@ -192,7 +207,7 @@
properties=build_properties, name="mbed-build",
macros=options.macros, verbose=options.verbose,
notify=notify, archive=False,
- app_config=options.app_config,
+ app_config=config,
build_profile=profile)
library_build_success = True
@@ -220,7 +235,7 @@
notify=notify,
jobs=options.jobs,
continue_on_build_fail=options.continue_on_build_fail,
- app_config=options.app_config,
+ app_config=config,
build_profile=profile,
stats_depth=options.stats_depth)
--- a/test_api.py Tue Oct 10 16:56:30 2017 -0500
+++ b/test_api.py Wed Oct 25 14:46:50 2017 -0500
@@ -50,6 +50,7 @@
from tools.utils import construct_enum
from tools.memap import MemapParser
from tools.targets import TARGET_MAP
+import tools.test_configs as TestConfig
from tools.test_db import BaseDBAccess
from tools.build_api import build_project, build_mbed_libs, build_lib
from tools.build_api import get_target_supported_toolchains
@@ -1643,11 +1644,10 @@
def get_module_avail(module_name):
- """ This function returns True if module_name is already impored module
+ """ This function returns True if module_name is already imported module
"""
return module_name in sys.modules.keys()
-
def get_autodetected_MUTS_list(platform_name_filter=None):
oldError = None
if os.name == 'nt':
@@ -1999,6 +1999,19 @@
return "-".join(name_parts).lower()
+def get_test_config(config_name, target_name):
+ """Finds the path to a test configuration file
+ config_name: path to a custom configuration file OR mbed OS interface "ethernet, wifi_odin, etc"
+ target_name: name of target to determing if mbed OS interface given is valid
+ returns path to config, boolean of whether it is a module or mbed OS interface
+ """
+ # If they passed in a full path
+ if exists(config_name):
+ # This is a module config
+ return config_name
+ # Otherwise find the path to configuration file based on mbed OS interface
+ return TestConfig.get_config_path(config_name, target_name)
+
def find_tests(base_dir, target_name, toolchain_name, app_config=None):
""" Finds all tests in a directory recursively
base_dir: path to the directory to scan for tests (ex. 'path/to/project')
--- a/toolchains/__init__.py Tue Oct 10 16:56:30 2017 -0500
+++ b/toolchains/__init__.py Wed Oct 25 14:46:50 2017 -0500
@@ -615,7 +615,8 @@
self.ignore_patterns.extend(normcase(p) for p in patterns)
else:
self.ignore_patterns.extend(normcase(join(real_base, pat)) for pat in patterns)
- self._ignore_regex = re.compile("|".join(fnmatch.translate(p) for p in self.ignore_patterns))
+ if self.ignore_patterns:
+ self._ignore_regex = re.compile("|".join(fnmatch.translate(p) for p in self.ignore_patterns))
# Create a Resources object from the path pointed to by *path* by either traversing a
# a directory structure, when *path* is a directory, or adding *path* to the resources,
--- a/toolchains/arm.py Tue Oct 10 16:56:30 2017 -0500
+++ b/toolchains/arm.py Wed Oct 25 14:46:50 2017 -0500
@@ -49,9 +49,6 @@
extra_verbose=extra_verbose,
build_profile=build_profile)
- if "ARM" not in target.supported_toolchains:
- raise NotSupportedException("ARM compiler support is required for ARM build")
-
if target.core == "Cortex-M0+":
cpu = "Cortex-M0"
elif target.core == "Cortex-M4F":
@@ -265,10 +262,26 @@
class ARM_STD(ARM):
- pass
+ def __init__(self, target, notify=None, macros=None,
+ silent=False, extra_verbose=False, build_profile=None,
+ build_dir=None):
+ ARM.__init__(self, target, notify, macros, silent,
+ build_dir=build_dir, extra_verbose=extra_verbose,
+ build_profile=build_profile)
+ if "ARM" not in target.supported_toolchains:
+ raise NotSupportedException("ARM compiler support is required for ARM build")
+
class ARM_MICRO(ARM):
PATCHED_LIBRARY = False
+ def __init__(self, target, notify=None, macros=None,
+ silent=False, extra_verbose=False, build_profile=None,
+ build_dir=None):
+ ARM.__init__(self, target, notify, macros, silent,
+ build_dir=build_dir, extra_verbose=extra_verbose,
+ build_profile=build_profile)
+ if not set(("ARM", "uARM")).intersection(set(target.supported_toolchains)):
+ raise NotSupportedException("ARM/uARM compiler support is required for ARM build")
class ARMC6(ARM_STD):
SHEBANG = "#! armclang -E --target=arm-arm-none-eabi -x c"
--- a/toolchains/iar.py Tue Oct 10 16:56:30 2017 -0500
+++ b/toolchains/iar.py Wed Oct 25 14:46:50 2017 -0500
@@ -84,7 +84,7 @@
self.cc += self.flags["common"] + c_flags_cmd + self.flags["c"]
self.cppc += self.flags["common"] + c_flags_cmd + cxx_flags_cmd + self.flags["cxx"]
- self.ld = [join(IAR_BIN, "ilinkarm")]
+ self.ld = [join(IAR_BIN, "ilinkarm")] + self.flags['ld']
self.ar = join(IAR_BIN, "iarchive")
self.elf2bin = join(IAR_BIN, "ielftool")
@@ -186,7 +186,7 @@
def link(self, output, objects, libraries, lib_dirs, mem_map):
# Build linker command
map_file = splitext(output)[0] + ".map"
- cmd = self.ld + [ "-o", output, "--map=%s" % map_file] + objects + libraries + self.flags['ld']
+ cmd = self.ld + [ "-o", output, "--map=%s" % map_file] + objects + libraries
if mem_map:
cmd.extend(["--config", mem_map])