mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #3791 from theotherjimmy/remove-cr
Remove GCC_CR and refurbish LPCXpresso exporterpull/3724/head
Sam Grove
GitHub
commit
067f5a0fef
|
|
@ -15,7 +15,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from tools.export import codered, ds5_5, iar, makefile
|
||||
from tools.export import lpcxpresso, ds5_5, iar, makefile
|
||||
from tools.export import embitz, coide, kds, simplicity, atmelstudio
|
||||
from tools.export import sw4stm32, e2studio, zip, cmsis, uvision, cdt
|
||||
from tools.export import gnuarmeclipse
|
||||
|
|
@ -24,7 +24,7 @@ from tools.targets import TARGET_NAMES
|
|||
EXPORTERS = {
|
||||
'uvision5': uvision.Uvision,
|
||||
'uvision': uvision.Uvision,
|
||||
'lpcxpresso': codered.CodeRed,
|
||||
'lpcxpresso': lpcxpresso.LPCXpresso,
|
||||
'gcc_arm': makefile.GccArm,
|
||||
'make_gcc_arm': makefile.GccArm,
|
||||
'make_armc5': makefile.Armc5,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{% extends "codered_cproject_common.tmpl" %}
|
||||
|
||||
{% block core %}cm0{% endblock %}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{% extends "codered_cproject_common.tmpl" %}
|
||||
|
||||
{% block core %}cm3{% endblock %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% extends "codered_project_common.tmpl" %}
|
||||
|
|
@ -18,9 +18,9 @@ from os.path import splitext, basename
|
|||
|
||||
from tools.export.exporters import Exporter
|
||||
|
||||
class CodeRed(Exporter):
|
||||
NAME = 'CodeRed'
|
||||
TOOLCHAIN = 'GCC_CR'
|
||||
class LPCXpresso(Exporter):
|
||||
NAME = 'LPCXpresso'
|
||||
TOOLCHAIN = 'GCC_ARM'
|
||||
|
||||
MBED_CONFIG_HEADER_SUPPORTED = True
|
||||
|
||||
|
|
@ -56,5 +56,5 @@ class CodeRed(Exporter):
|
|||
'symbols': self.toolchain.get_symbols()
|
||||
}
|
||||
ctx.update(self.flags)
|
||||
self.gen_file('codered/%s_project.tmpl' % self.target.lower(), ctx, '.project')
|
||||
self.gen_file('codered/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
|
||||
self.gen_file('lpcxpresso/%s_project.tmpl' % self.target.lower(), ctx, '.project')
|
||||
self.gen_file('lpcxpresso/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm3_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm3_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc176x.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{% extends "lpcxpresso/cproject_common.tmpl" %}
|
||||
|
||||
{% block core %}cm0{% endblock %}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{% extends "lpcxpresso/cproject_common.tmpl" %}
|
||||
|
||||
{% block core %}cm3{% endblock %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc11xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc11xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc11xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc11xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}startup_LPC11U68.cpp{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm3_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm3_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc15xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxprosso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm3_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm3_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc176x.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}startup_LPC824_CR.cpp{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm0_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm0_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc11xx.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "codered_cproject_cortexm3_common.tmpl" %}
|
||||
{% extends "lpcxpresso/cproject_cortexm3_common.tmpl" %}
|
||||
|
||||
{% block startup_file %}cr_startup_lpc176x.c{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
{% extends "lpcxpresso/project_common.tmpl" %}
|
||||
|
|
@ -1395,26 +1395,24 @@ class mbedToolchain:
|
|||
return Config.config_to_macros(self.config_data) if self.config_data else []
|
||||
|
||||
from tools.settings import ARM_PATH
|
||||
from tools.settings import GCC_ARM_PATH, GCC_CR_PATH
|
||||
from tools.settings import GCC_ARM_PATH
|
||||
from tools.settings import IAR_PATH
|
||||
|
||||
TOOLCHAIN_PATHS = {
|
||||
'ARM': ARM_PATH,
|
||||
'uARM': ARM_PATH,
|
||||
'GCC_ARM': GCC_ARM_PATH,
|
||||
'GCC_CR': GCC_CR_PATH,
|
||||
'IAR': IAR_PATH
|
||||
}
|
||||
|
||||
from tools.toolchains.arm import ARM_STD, ARM_MICRO
|
||||
from tools.toolchains.gcc import GCC_ARM, GCC_CR
|
||||
from tools.toolchains.gcc import GCC_ARM
|
||||
from tools.toolchains.iar import IAR
|
||||
|
||||
TOOLCHAIN_CLASSES = {
|
||||
'ARM': ARM_STD,
|
||||
'uARM': ARM_MICRO,
|
||||
'GCC_ARM': GCC_ARM,
|
||||
'GCC_CR': GCC_CR,
|
||||
'IAR': IAR
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ class GCC(mbedToolchain):
|
|||
INDEX_PATTERN = re.compile('(?P<col>\s*)\^')
|
||||
|
||||
def __init__(self, target, notify=None, macros=None,
|
||||
silent=False, tool_path="", extra_verbose=False,
|
||||
build_profile=None):
|
||||
silent=False, extra_verbose=False, build_profile=None):
|
||||
mbedToolchain.__init__(self, target, notify, macros, silent,
|
||||
extra_verbose=extra_verbose,
|
||||
build_profile=build_profile)
|
||||
|
||||
tool_path=TOOLCHAIN_PATHS['GCC_ARM']
|
||||
# Add flags for current size setting
|
||||
default_lib = "std"
|
||||
if hasattr(target, "default_lib"):
|
||||
|
|
@ -92,7 +92,7 @@ class GCC(mbedToolchain):
|
|||
|
||||
self.flags['ld'] += self.cpu
|
||||
self.ld = [join(tool_path, "arm-none-eabi-gcc")] + self.flags['ld']
|
||||
self.sys_libs = ["stdc++", "supc++", "m", "c", "gcc"]
|
||||
self.sys_libs = ["stdc++", "supc++", "m", "c", "gcc", "nosys"]
|
||||
self.preproc = [join(tool_path, "arm-none-eabi-cpp"), "-E", "-P"]
|
||||
|
||||
self.ar = join(tool_path, "arm-none-eabi-ar")
|
||||
|
|
@ -126,7 +126,7 @@ class GCC(mbedToolchain):
|
|||
# The warning/error notification is multiline
|
||||
msg = None
|
||||
for line in output.splitlines():
|
||||
match = GCC.DIAGNOSTIC_PATTERN.search(line)
|
||||
match = self.DIAGNOSTIC_PATTERN.search(line)
|
||||
if match is not None:
|
||||
if msg is not None:
|
||||
self.cc_info(msg)
|
||||
|
|
@ -143,7 +143,7 @@ class GCC(mbedToolchain):
|
|||
}
|
||||
elif msg is not None:
|
||||
# Determine the warning/error column by calculating the ^ position
|
||||
match = GCC.INDEX_PATTERN.match(line)
|
||||
match = self.INDEX_PATTERN.match(line)
|
||||
if match is not None:
|
||||
msg['col'] = len(match.group('col'))
|
||||
self.cc_info(msg)
|
||||
|
|
@ -280,8 +280,6 @@ class GCC(mbedToolchain):
|
|||
def redirect_symbol(source, sync, build_dir):
|
||||
return "-Wl,--defsym=%s=%s" % (source, sync)
|
||||
|
||||
|
||||
class GCC_ARM(GCC):
|
||||
@staticmethod
|
||||
def check_executable():
|
||||
"""Returns True if the executable (arm-none-eabi-gcc) location
|
||||
|
|
@ -289,37 +287,5 @@ class GCC_ARM(GCC):
|
|||
Returns False otherwise."""
|
||||
return mbedToolchain.generic_check_executable("GCC_ARM", 'arm-none-eabi-gcc', 1)
|
||||
|
||||
def __init__(self, target, notify=None, macros=None,
|
||||
silent=False, extra_verbose=False, build_profile=None):
|
||||
GCC.__init__(self, target, notify, macros, silent,
|
||||
TOOLCHAIN_PATHS['GCC_ARM'], extra_verbose=extra_verbose,
|
||||
build_profile=build_profile)
|
||||
|
||||
self.sys_libs.append("nosys")
|
||||
|
||||
|
||||
class GCC_CR(GCC):
|
||||
@staticmethod
|
||||
def check_executable():
|
||||
"""Returns True if the executable (arm-none-eabi-gcc) location
|
||||
specified by the user exists OR the executable can be found on the PATH.
|
||||
Returns False otherwise."""
|
||||
return mbedToolchain.generic_check_executable("GCC_CR", 'arm-none-eabi-gcc', 1)
|
||||
|
||||
def __init__(self, target, notify=None, macros=None,
|
||||
silent=False, extra_verbose=False, build_profile=None):
|
||||
GCC.__init__(self, target, notify, macros, silent,
|
||||
TOOLCHAIN_PATHS['GCC_CR'], extra_verbose=extra_verbose,
|
||||
build_profile=build_profile)
|
||||
|
||||
additional_compiler_flags = [
|
||||
"-D__NEWLIB__", "-D__CODE_RED", "-D__USE_CMSIS", "-DCPP_USE_HEAP",
|
||||
]
|
||||
self.cc += additional_compiler_flags
|
||||
self.cppc += additional_compiler_flags
|
||||
|
||||
# Use latest gcc nanolib
|
||||
self.ld.append("--specs=nano.specs")
|
||||
if target.name in ["LPC1768", "LPC4088", "LPC4088_DM", "LPC4330", "UBLOX_C027", "LPC2368"]:
|
||||
self.ld.extend(["-u _printf_float", "-u _scanf_float"])
|
||||
self.ld += ["-nostdlib"]
|
||||
class GCC_ARM(GCC):
|
||||
pass
|
||||
|
|
|
|||
Loading…
Reference in New Issue