Skip to content

Update CMSIS to 5.5.1 #10366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 12, 2019
Merged

Update CMSIS to 5.5.1 #10366

merged 14 commits into from
Apr 12, 2019

Conversation

kjbracey
Copy link
Contributor

Description

Import CMSIS 5.5.1.

Replaces #10148, which was cherry-picking just one RTX update.

Slight changes made to the importer JSON, and fault handler/exception code moved from cmsis to platform, as its presence in cmsis complicates the import process. (Was moved from rtos to platform early in first version of #8332, then was moved to cmsis on the grounds that "core specific code is in CMSIS", but it doesn't make sense to mix our own code with the CMSIS code for maintenance purposes).

Pull request type

[ ] Fix
[X] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@deepikabhavnani, @SenRamakri, @bulislaw, @c1728p9

Release Notes

  • CMSIS updated from 5.4.0 to 5.5.1

kjbracey and others added 13 commits April 9, 2019 17:34
Having them in cmsis causes grief when attempting to update CMSIS with
the importer script.
mbed OS used older RTX4 version and with osThreadDef accepting only 3
parameters, to preserve compatibility we hardcode the 'instances'
parameter to 1.

(cherry picked from commit 428acae)
(cherry picked from commit 4360b7b)
(cherry picked from commit 6a6e3ac)
tz_context.c should be compiled only for secure world,
definition of API's in tz_context.h should be part of secure
binary/bootloader when building mbed-os as non-secure

(Cherry picked from d0a43b8)

(cherry picked from commit fb35475)
- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation.

(cherry picked from commit d3f7abd)
In case of ARM compiler, idle and timer thread stack though assigned
to `.bss.os` section since not zero initialized are part of `data` section.

In this commit, we are moving stacks of idle and timer thread to bss
section and thereby saving ROM space.

(cherry picked from commit ba92372)
CMSIS repo does not support pre-processor defines, hence multiple assembly
files are added for secure/non-secure and floating point tools.
Mbed OS tools support assembly file pre-processing, but the build system
does not support multiple assembly files for each target, hence updating
the assembly files.

1. Patch RTX so irq_cm4f.S files work with no FPU targets
2. Patch RTX so irq_armv8mml.S files to work with and without FPU
2. Patch RTX so irq_armv8mml.S and irq_armv8mbl.S files to work with secure and
   non-secure builds

(cherry picked from commit 0946627)
@ciarmcom
Copy link
Member

@kjbracey-arm, thank you for your changes.
@bulislaw @SenRamakri @c1728p9 @deepikabhavnani @ARMmbed/mbed-os-core @ARMmbed/mbed-os-tools @ARMmbed/mbed-os-maintainers please review.

Copy link

@deepikabhavnani deepikabhavnani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating CMSIS, looks good to me 👍

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 11, 2019

while we wait for some additional reviews, CI scheduled

@mbed-ci
Copy link

mbed-ci commented Apr 11, 2019

Test run: FAILED

Summary: 1 of 11 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 11, 2019

Restarting test, both show success in logs

Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me! Nice work!

@cmonr cmonr merged commit 582edf5 into ARMmbed:master Apr 12, 2019
@kjbracey kjbracey deleted the feature_CMSIS_5_ca812421 branch April 12, 2019 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants