Skip to content

Commit 07a6c07

Browse files
committed
Revert "Disable Cortex-A in tooling to provide better error messages"
This reverts commit f5859b3.
1 parent 88c398b commit 07a6c07

File tree

7 files changed

+3
-25
lines changed

7 files changed

+3
-25
lines changed

tools/build.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from tools.targets import TARGET_NAMES, TARGET_MAP
3333
from tools.options import get_default_options_parser
3434
from tools.options import extract_profile
35-
from tools.options import mcu_is_enabled
3635
from tools.build_api import build_library, build_mbed_libs, build_lib
3736
from tools.build_api import mcu_toolchain_matrix
3837
from tools.build_api import print_build_results
@@ -136,7 +135,6 @@
136135

137136
# Get target list
138137
targets = options.mcu if options.mcu else TARGET_NAMES
139-
assert [mcu_is_enabled(parser, mcu) for mcu in targets]
140138

141139
# Get toolchains list
142140
toolchains = options.tool if options.tool else TOOLCHAINS

tools/build_api.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,9 +1244,6 @@ def mcu_toolchain_matrix(verbose_html=False, platform_filter=None,
12441244
# FIlter out platforms using regex
12451245
if re.search(platform_filter, target) is None:
12461246
continue
1247-
# TODO: Remove this check when Cortex-A is re-enabled
1248-
if "Cortex-A" in TARGET_MAP[target].core:
1249-
continue
12501247
target_counter += 1
12511248

12521249
row = [target] # First column is platform name

tools/export/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from tools.export import sw4stm32, e2studio, zip, cmsis, uvision, cdt, vscode
3434
from tools.export import gnuarmeclipse
3535
from tools.export import qtcreator
36-
from tools.targets import TARGET_NAMES, TARGET_MAP
36+
from tools.targets import TARGET_NAMES
3737

3838
EXPORTERS = {
3939
'uvision5': uvision.Uvision,
@@ -100,8 +100,6 @@ def mcu_ide_matrix(verbose_html=False):
100100

101101
perm_counter = 0
102102
for target in sorted(TARGET_NAMES):
103-
if "Cortex-A" in TARGET_MAP[target].core:
104-
continue
105103
row = [target] # First column is platform name
106104
for ide in supported_ides:
107105
text = "-"

tools/make.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
from tools.targets import TARGET_MAP
4343
from tools.options import get_default_options_parser
4444
from tools.options import extract_profile
45-
from tools.options import mcu_is_enabled
4645
from tools.build_api import build_project
4746
from tools.build_api import mcu_toolchain_matrix
4847
from tools.build_api import mcu_toolchain_list
@@ -202,7 +201,6 @@
202201
if options.mcu is None :
203202
args_error(parser, "argument -m/--mcu is required")
204203
mcu = options.mcu[0]
205-
assert mcu_is_enabled(parser, mcu)
206204

207205
# Toolchain
208206
if options.tool is None:

tools/options.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from os import listdir
2020
from argparse import ArgumentParser
2121
from tools.toolchains import TOOLCHAINS
22-
from tools.targets import TARGET_NAMES, TARGET_MAP
22+
from tools.targets import TARGET_NAMES
2323
from tools.utils import argparse_force_uppercase_type, \
2424
argparse_lowercase_hyphen_type, argparse_many, \
2525
argparse_filestring_type, args_error, argparse_profile_filestring_type,\
@@ -121,13 +121,3 @@ def extract_profile(parser, options, toolchain, fallback="develop"):
121121
" supported by profile {}").format(toolchain,
122122
filename))
123123
return profile
124-
125-
def mcu_is_enabled(parser, mcu):
126-
if "Cortex-A" in TARGET_MAP[mcu].core:
127-
args_error(
128-
parser,
129-
("%s Will be supported in mbed OS 5.6. "
130-
"To use the %s, please checkout the mbed OS 5.4 release branch. "
131-
"See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
132-
"for more information") % (mcu, mcu))
133-
return True

tools/project.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from tools.utils import argparse_force_lowercase_type
2121
from tools.utils import argparse_force_uppercase_type
2222
from tools.utils import print_large_string
23-
from tools.options import extract_profile, list_profiles, mcu_is_enabled
23+
from tools.options import extract_profile, list_profiles
2424

2525
def setup_project(ide, target, program=None, source_dir=None, build=None, export_path=None):
2626
"""Generate a name, if not provided, and find dependencies
@@ -221,7 +221,6 @@ def main():
221221
if not options.mcu:
222222
args_error(parser, "argument -m/--mcu is required")
223223

224-
assert mcu_is_enabled(parser, options.mcu)
225224
# Toolchain
226225
if not options.ide:
227226
args_error(parser, "argument -i is required")

tools/test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
from utils import argparse_dir_not_parent
4040
from tools.toolchains import mbedToolchain, TOOLCHAIN_PATHS, TOOLCHAIN_CLASSES
4141
from tools.settings import CLI_COLOR_MAP
42-
from tools.options import mcu_is_enabled
4342

4443
if __name__ == '__main__':
4544
try:
@@ -116,7 +115,6 @@
116115
if options.mcu is None :
117116
args_error(parser, "argument -m/--mcu is required")
118117
mcu = options.mcu[0]
119-
assert mcu_is_enabled(parser, mcu)
120118

121119
# Toolchain
122120
if options.tool is None:

0 commit comments

Comments
 (0)