From 652147d65b3ebe628d76f36c41081bb877abb195 Mon Sep 17 00:00:00 2001 From: Brian Daniels Date: Tue, 2 Oct 2018 10:51:54 -0500 Subject: [PATCH] Remove references to GCC_CR from the rest of the tools --- tools/build_api.py | 2 +- tools/memap.py | 4 ++-- tools/singletest.py | 2 +- tools/size.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build_api.py b/tools/build_api.py index 3589a95242..f92007aa9b 100644 --- a/tools/build_api.py +++ b/tools/build_api.py @@ -292,7 +292,7 @@ def prepare_toolchain(src_paths, build_dir, target, toolchain_name, Positional arguments: src_paths - the paths to source directories target - ['LPC1768', 'LPC11U24', etc.] - toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'GCC_CR'] + toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'IAR'] Keyword arguments: macros - additional macros diff --git a/tools/memap.py b/tools/memap.py index 00c5aa36f5..19bbf3bef5 100644 --- a/tools/memap.py +++ b/tools/memap.py @@ -764,7 +764,7 @@ class MemapParser(object): return output - toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "GCC_CR", "IAR"] + toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "IAR"] def compute_report(self): """ Generates summary of memory usage for main areas @@ -814,7 +814,7 @@ class MemapParser(object): self.tc_name = toolchain.title() if toolchain in ("ARM", "ARM_STD", "ARM_MICRO", "ARMC6"): parser = _ArmccParser - elif toolchain == "GCC_ARM" or toolchain == "GCC_CR": + elif toolchain == "GCC_ARM": parser = _GccParser elif toolchain == "IAR": parser = _IarParser diff --git a/tools/singletest.py b/tools/singletest.py index a07ecd4b23..21b7878e25 100644 --- a/tools/singletest.py +++ b/tools/singletest.py @@ -24,7 +24,7 @@ File format example: test_spec.json: { "targets": { "KL46Z": ["ARM", "GCC_ARM"], - "LPC1768": ["ARM", "GCC_ARM", "GCC_CR", "IAR"], + "LPC1768": ["ARM", "GCC_ARM", "IAR"], "LPC11U24": ["uARM"], "NRF51822": ["ARM"] } diff --git a/tools/size.py b/tools/size.py index 85455e2312..7d489159f0 100644 --- a/tools/size.py +++ b/tools/size.py @@ -63,7 +63,7 @@ def benchmarks(): csv_data.writerow(['Toolchain', "Target", "Benchmark", "code", "data", "bss", "flash"]) # Build - for toolchain in ['ARM', 'uARM', 'GCC_CR', 'GCC_ARM']: + for toolchain in ['ARM', 'uARM', 'GCC_ARM']: for mcu in ["LPC1768", "LPC11U24"]: # Build Libraries build_mbed_libs(mcu, toolchain) @@ -118,4 +118,4 @@ def compare(t1, t2, target): if __name__ == '__main__': - compare("GCC_CR", "LPC1768") + compare("ARM", "GCC_ARM", "LPC1768")