From a8c9cf1322a83d45d0759a81f352c4089c98cfc5 Mon Sep 17 00:00:00 2001 From: deepikabhavnani Date: Fri, 25 Jan 2019 09:24:04 -0600 Subject: [PATCH] Change DSP variant symbol to `E` from `D`(d-double floating point) --- tools/targets/__init__.py | 8 ++++---- tools/toolchains/__init__.py | 4 ++-- tools/toolchains/arm.py | 6 +++--- tools/toolchains/gcc.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/targets/__init__.py b/tools/targets/__init__.py index 9ec4fca800..b083f74dd7 100644 --- a/tools/targets/__init__.py +++ b/tools/targets/__init__.py @@ -52,8 +52,8 @@ CORE_LABELS = { "Cortex-M33-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"], "Cortex-M33F": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"], "Cortex-M33F-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"], - "Cortex-M33FD": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"], - "Cortex-M33FD-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"] + "Cortex-M33FE": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"], + "Cortex-M33FE-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"] } CORE_ARCH = { @@ -73,8 +73,8 @@ CORE_ARCH = { "Cortex-M33F": 8, "Cortex-M33-NS": 8, "Cortex-M33F-NS": 8, - "Cortex-M33FD": 8, - "Cortex-M33FD-NS": 8, + "Cortex-M33FE": 8, + "Cortex-M33FE-NS": 8, } ################################################################################ diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index e88fe8f02e..6595538f8d 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -78,8 +78,8 @@ class mbedToolchain: "Cortex-M33": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"], "Cortex-M33F-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"], "Cortex-M33F": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"], - "Cortex-M33FD-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM", "__DSP_PRESENT=1U"], - "Cortex-M33FD": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM", "__DSP_PRESENT=1U"], + "Cortex-M33FE-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM", "__DSP_PRESENT=1U"], + "Cortex-M33FE": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM", "__DSP_PRESENT=1U"], } MBED_CONFIG_FILE_NAME="mbed_config.h" diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index 352d3d8d31..762f0b1fad 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -364,7 +364,7 @@ class ARMC6(ARM_STD): SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4", "Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD", "Cortex-M23", "Cortex-M23-NS", "Cortex-M33", "Cortex-M33F", - "Cortex-M33-NS", "Cortex-M33F-NS", "Cortex-M33FD-NS", "Cortex-M33FD", + "Cortex-M33-NS", "Cortex-M33F-NS", "Cortex-M33FE-NS", "Cortex-M33FE", "Cortex-A9"] ARMCC_RANGE = (LooseVersion("6.10"), LooseVersion("7.0")) @@ -414,7 +414,7 @@ class ARMC6(ARM_STD): "Cortex-M7FD": "cortex-m7", "Cortex-M33": "cortex-m33+no_dsp+no_fp", "Cortex-M33F": "cortex-m33+no_dsp", - "Cortex-M33FD": "cortex-m33"}.get(core, core) + "Cortex-M33FE": "cortex-m33"}.get(core, core) cpu = cpu.lower() self.flags['common'].append("-mcpu=%s" % cpu) @@ -449,7 +449,7 @@ class ARMC6(ARM_STD): "Cortex-M7FD": "Cortex-M7.fp.dp", "Cortex-M33": "Cortex-M33.no_dsp.no_fp", "Cortex-M33F": "Cortex-M33.no_dsp", - "Cortex-M33FD": "Cortex-M33"}.get(core, core) + "Cortex-M33FE": "Cortex-M33"}.get(core, core) self.flags['asm'].append("--cpu=%s" % asm_cpu) diff --git a/tools/toolchains/gcc.py b/tools/toolchains/gcc.py index 39866337b4..18283f6da6 100644 --- a/tools/toolchains/gcc.py +++ b/tools/toolchains/gcc.py @@ -72,7 +72,7 @@ class GCC(mbedToolchain): self.cpu = ["-mcpu=cortex-m4"] elif core.startswith("Cortex-M7"): self.cpu = ["-mcpu=cortex-m7"] - elif core == "Cortex-M33FD": + elif core == "Cortex-M33FE": self.cpu = ["-mcpu=cortex-m33"] elif core == "Cortex-M33F": self.cpu = ["-mcpu=cortex-m33+nodsp"]