Skip to content

Commit 6bf7fd3

Browse files
author
Nir Sonnenschein
authored
Merge pull request #10204 from ARMmbed/release-candidate
Release candidate for mbed-os-5.12.0-rc4
2 parents 85cbc29 + 3f9e266 commit 6bf7fd3

File tree

22 files changed

+522
-314
lines changed

22 files changed

+522
-314
lines changed

‎features/cellular/framework/AT/AT_CellularContext.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ nsapi_error_t AT_CellularContext::set_blocking(bool blocking)
253253

254254
void AT_CellularContext::set_plmn(const char *plmn)
255255
{
256-
tr_info("CellularContext plmn %s", plmn);
256+
tr_info("CellularContext plmn %s", (plmn ? plmn : "NULL"));
257257
_device->set_plmn(plmn);
258258
}
259259

‎features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "QUECTEL_BG96_CellularStack.h"
2121
#include "QUECTEL_BG96_CellularInformation.h"
2222
#include "QUECTEL_BG96_CellularContext.h"
23+
#include "CellularLog.h"
2324

2425
using namespace mbed;
2526
using namespace events;

‎features/mbedtls/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
development
1+
mbedtls-2.17.0

‎features/mbedtls/importer/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#
2828

2929
# Set the mbed TLS release to import (this can/should be edited before import)
30-
MBED_TLS_RELEASE ?= development
30+
MBED_TLS_RELEASE ?= mbedtls-2.17.0
3131
MBED_TLS_REPO_URL ?= [email protected]:ARMmbed/mbedtls.git
3232

3333
# Translate between mbed TLS namespace and mbed namespace

‎features/mbedtls/mbed-crypto/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mbedcrypto-1.0.0d7
1+
mbedcrypto-1.0.0

‎features/mbedtls/mbed-crypto/importer/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Set the Mbed Crypto release to import (this can/should be edited before
3131
# import)
32-
CRYPTO_RELEASE ?= mbedcrypto-1.0.0d7
32+
CRYPTO_RELEASE ?= mbedcrypto-1.0.0
3333
CRYPTO_REPO_URL ?= [email protected]:ARMmbed/mbed-crypto.git
3434

3535
# Translate between Mbed Crypto namespace and Mbed OS namespace

‎targets/targets.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2594,7 +2594,7 @@
25942594
},
25952595
"MTB_MXCHIP_EMW3166": {
25962596
"inherits": ["FAMILY_STM32"],
2597-
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
2597+
"supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
25982598
"core": "Cortex-M4F",
25992599
"extra_labels_add": [
26002600
"STM32F4",
@@ -2627,7 +2627,7 @@
26272627
},
26282628
"USI_WM_BN_BM_22": {
26292629
"inherits": ["FAMILY_STM32"],
2630-
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
2630+
"supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
26312631
"components_add": ["SPIF", "FLASHIAP"],
26322632
"core": "Cortex-M4F",
26332633
"extra_labels_add": [
@@ -5273,7 +5273,7 @@
52735273
"RZ_A1XX": {
52745274
"inherits": ["Target"],
52755275
"core": "Cortex-A9",
5276-
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
5276+
"supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
52775277
"extra_labels": ["RENESAS", "RZ_A1XX"],
52785278
"device_has": [
52795279
"SLEEP",
@@ -8085,7 +8085,7 @@
80858085
"public-ram-start": "0x08047600",
80868086
"public-ram-size": "0x200"
80878087
},
8088-
"device_name": "CY8C6247BZI-D54",
8088+
"sectors": [[268435456, 512]],
80898089
"bootloader_supported": true
80908090
},
80918091
"CY8CMOD_062_4343W": {
@@ -8117,7 +8117,7 @@
81178117
"post_binary_hook": {
81188118
"function": "PSOC6Code.complete"
81198119
},
8120-
"device_name": "CY8C6347BZI-BLD53",
8120+
"sectors": [[268443648, 512]],
81218121
"bootloader_supported": true
81228122
},
81238123
"CY8CKIT_062_4343W": {

‎tools/arm_pack_manager/index.json‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -462778,56 +462778,5 @@
462778462778
],
462779462779
"vendor": "Nordic Semiconductor:54"
462780462780
},
462781-
"CY8C6347BZI-BLD53": {
462782-
"core": "Cortex-M4",
462783-
"vendor": "Cypress",
462784-
"sectors": [
462785-
[
462786-
268435456,
462787-
512
462788-
]
462789-
],
462790-
"memories": {
462791-
"IROM1": {
462792-
"access": {
462793-
"execute": true,
462794-
"non_secure": true,
462795-
"non_secure_callable": false,
462796-
"peripheral": false,
462797-
"read": true,
462798-
"secure": false,
462799-
"write": true
462800-
},
462801-
"default": true,
462802-
"start": "0x10002000",
462803-
"size": "0x000FE000"
462804-
}
462805-
}
462806-
},
462807-
"CY8C6247BZI-D54": {
462808-
"core": "Cortex-M4",
462809-
"vendor": "Cypress",
462810-
"sectors": [
462811-
[
462812-
268435456,
462813-
512
462814-
]
462815-
],
462816-
"memories": {
462817-
"IROM1": {
462818-
"access": {
462819-
"execute": true,
462820-
"non_secure": true,
462821-
"non_secure_callable": false,
462822-
"peripheral": false,
462823-
"read": true,
462824-
"secure": false,
462825-
"write": true
462826-
},
462827-
"start": "0x10040000",
462828-
"size": "0xB8000"
462829-
}
462830-
}
462831-
},
462832462781
"version": "0.2.0"
462833462782
}

‎tools/build.py‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@
2929
sys.path.insert(0, ROOT)
3030

3131

32-
from tools.toolchains import TOOLCHAINS, TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
33-
from tools.toolchains import mbedToolchain
34-
from tools.targets import TARGET_NAMES, TARGET_MAP, Target
32+
from tools.toolchains import TOOLCHAINS
33+
from tools.targets import TARGET_NAMES, Target
3534
from tools.options import get_default_options_parser
3635
from tools.options import extract_profile
3736
from tools.options import extract_mcus
3837
from tools.build_api import build_library, build_mbed_libs, build_lib
3938
from tools.build_api import mcu_toolchain_matrix
4039
from tools.build_api import print_build_results
41-
from tools.build_api import get_toolchain_name
42-
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
43-
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, CLI_COLOR_MAP
40+
from tools.build_api import target_supports_toolchain
41+
from tools.build_api import find_valid_toolchain
4442
from tools.notifier.term import TerminalNotifier
4543
from tools.utils import argparse_filestring_type, args_error, argparse_many
46-
from tools.utils import argparse_filestring_type, argparse_dir_not_parent
44+
from tools.utils import argparse_dir_not_parent
45+
from tools.utils import NoValidToolchainException
46+
from tools.utils import print_end_warnings
4747
from tools.paths import is_relative_to_root
4848

49-
if __name__ == '__main__':
49+
def main():
5050
start = time()
5151

5252
# Parse Options
@@ -169,40 +169,37 @@
169169
failures = []
170170
successes = []
171171
skipped = []
172+
end_warnings = []
172173

173-
toolchain_names = set()
174174
for toolchain in toolchains:
175175
for target_name in targets:
176176
target = Target.get_target(target_name)
177-
toolchain_names.add(get_toolchain_name(target, toolchain))
178177

179-
for toolchain_name in toolchain_names:
180-
if not TOOLCHAIN_CLASSES[toolchain_name].check_executable():
181-
search_path = TOOLCHAIN_PATHS[toolchain_name] or "No path set"
182-
args_error(parser, "Could not find executable for %s.\n"
183-
"Currently set search path: %s"
184-
% (toolchain_name, search_path))
178+
try:
179+
toolchain_name, internal_tc_name, end_warnings = find_valid_toolchain(
180+
target, toolchain
181+
)
182+
except NoValidToolchainException as e:
183+
print_end_warnings(e.end_warnings)
184+
args_error(parser, str(e))
185185

186-
for toolchain in toolchains:
187-
for target in targets:
188-
tt_id = "%s::%s" % (toolchain, target)
189-
if toolchain not in TARGET_MAP[target].supported_toolchains:
186+
tt_id = "%s::%s" % (internal_tc_name, target_name)
187+
if not target_supports_toolchain(target, toolchain):
190188
# Log this later
191189
print("%s skipped: toolchain not supported" % tt_id)
192190
skipped.append(tt_id)
193191
else:
194192
try:
195193
notifier = TerminalNotifier(options.verbose, options.silent)
196-
mcu = TARGET_MAP[target]
197-
profile = extract_profile(parser, options, toolchain)
194+
profile = extract_profile(parser, options, internal_tc_name)
198195

199-
if mcu.is_PSA_secure_target and \
196+
if target.is_PSA_secure_target and \
200197
not is_relative_to_root(options.source_dir):
201198
options.source_dir = ROOT
202199

203200
if options.source_dir:
204201
lib_build_res = build_library(
205-
options.source_dir, options.build_dir, mcu, toolchain,
202+
options.source_dir, options.build_dir, target, toolchain_name,
206203
jobs=options.jobs,
207204
clean=options.clean,
208205
archive=(not options.no_archive),
@@ -214,7 +211,7 @@
214211
)
215212
else:
216213
lib_build_res = build_mbed_libs(
217-
mcu, toolchain,
214+
target, toolchain_name,
218215
jobs=options.jobs,
219216
clean=options.clean,
220217
macros=options.macros,
@@ -225,7 +222,7 @@
225222

226223
for lib_id in libraries:
227224
build_lib(
228-
lib_id, mcu, toolchain,
225+
lib_id, target, toolchain_name,
229226
clean=options.clean,
230227
macros=options.macros,
231228
jobs=options.jobs,
@@ -236,10 +233,15 @@
236233
successes.append(tt_id)
237234
else:
238235
skipped.append(tt_id)
236+
except KeyboardInterrupt as e:
237+
print("\n[CTRL+c] exit")
238+
print_end_warnings(end_warnings)
239+
sys.exit(0)
239240
except Exception as e:
240241
if options.verbose:
241242
import traceback
242243
traceback.print_exc(file=sys.stdout)
244+
print_end_warnings(end_warnings)
243245
sys.exit(1)
244246
failures.append(tt_id)
245247
print(e)
@@ -254,5 +256,10 @@
254256
if report:
255257
print(print_build_results(report, report_name))
256258

259+
print_end_warnings(end_warnings)
257260
if failures:
258261
sys.exit(1)
262+
263+
264+
if __name__ == '__main__':
265+
main()

0 commit comments

Comments
 (0)