Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update CMSIS to 5.4.0 #7875

Merged
merged 17 commits into from
Aug 31, 2018
Merged

Update CMSIS to 5.4.0 #7875

merged 17 commits into from
Aug 31, 2018

Commits on Aug 26, 2018

  1. Move Code to get Cortex A tick irqn 

    Move the function "mbed_get_a9_tick_irqn()" declared in os_tick.h
to SysTimer.h so it does not get overridden when RTX is updated.

This function was originally added in:
3d3e890
Fixes for RZ_A1H issue 6543
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    5d0aac5 View commit details
    Browse the repository at this point in the history

  2. Revert uVisor changes for K64F 

    Revert the changes made in the commit:
1c2a7d8
Added the commit: Access MCG and SIM through secure access
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    4ff5ea4 View commit details
    Browse the repository at this point in the history

  3. Revert "EFM32: Use SECURE_ACCESS to access the ROM table" 

    This reverts commit 1b0922e.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    22ebf69 View commit details
    Browse the repository at this point in the history

  4. Update cmsis_importer in prep for CMSIS 5.4.0 

    Reference the correct commits to pull in and remove commits related to
uVisor since these are no longer needed. Also add the missing file
cmsis_os1.c to cmsis_importer.json.

Below is detailed information on each commit added to cmsis_importer.json

CMSIS/RTX: Patch RTX4 to preserve osThreadDef compatibility
4360b7b

CMSIS/RTX: Patch RTX so irq_cm4f.s files work with no FPU targets
cc2e051

CMSIS/RTX: Allow overwriting mutex ops for ARMC
b882548

CMSIS/RTX: Pre-processor defines used for assembly
287121f

CMSIS/RTX: Fix using FALSE/TRUE with preprocesor
1752803

CMSIS/RTX: Reintroduce arm_math.h
6a6e3ac

fixup
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    a2a0ea7 View commit details
    Browse the repository at this point in the history

  5. Add details to importer script docs 

    Add an example showing how to run the importer and a note to indicate
that it must be run from the mbed-os directory.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    a62b312 View commit details
    Browse the repository at this point in the history

  6. [CMSIS_5]: Updated to 0b521765

    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    342841a View commit details
    Browse the repository at this point in the history

  7. CMSIS/RTX: Patch RTX4 to preserve osThreadDef compatibility 

    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)
    @bulislaw @c1728p9
    bulislaw authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    9a87d7b View commit details
    Browse the repository at this point in the history

  8. CMSIS/RTX: Patch RTX so irq_cm4f.s files work with no FPU targets 

    (cherry picked from commit cc2e051)
    @bulislaw @c1728p9
    bulislaw authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    1be672d View commit details
    Browse the repository at this point in the history

  9. CMSIS/RTX: Allow overwriting mutex ops for ARMC 

    (cherry picked from commit b882548)
    @bulislaw @c1728p9
    bulislaw authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    4fd0daf View commit details
    Browse the repository at this point in the history

  10. CMSIS/RTX: Pre-processor defines used for assembly 

    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.

(cherry picked from commit 287121f)
    @c1728p9
    deepikabhavnani authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    67b677d View commit details
    Browse the repository at this point in the history

  11. CMSIS/RTX: Fix using FALSE/TRUE with preprocesor 

    (cherry picked from commit 1752803)
    @bulislaw @c1728p9
    bulislaw authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    b7efe36 View commit details
    Browse the repository at this point in the history

  12. CMSIS/RTX: Reintroduce arm_math.h 

    (cherry picked from commit 6a6e3ac)
    @bulislaw @c1728p9
    bulislaw authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    ace5df9 View commit details
    Browse the repository at this point in the history

  13. CMSIS/RTX: Patch to conditionally compile 

    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)
    @c1728p9
    Deepika authored and c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    fb35475 View commit details
    Browse the repository at this point in the history

  14. CMSIS/RTX: Remove the file os_tick_gtim.c 

    Cortex-A devices in mbed-os supply their own OS timer so the code
from RTX is not needed.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    6f7964b View commit details
    Browse the repository at this point in the history

  15. Fix define around EvrRtxKernelInitialized 

    Rename the define EVR_RTX_KERNEL_INITIALIZE_COMPLETED_DISABLE to
EVR_RTX_KERNEL_INITIALIZED_DISABLE so it matches the rest of RTX.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    d5be92a View commit details
    Browse the repository at this point in the history

  16. Fix CMSIS __RESTRICT define for IAR 

    Revert the define __RESTRICT from "__restrict" to "restrict". This
fixes compilation for IAR.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    308dfe3 View commit details
    Browse the repository at this point in the history

  17. Remove double free RTOS tests 

    Remove the double free RTOS tests since this was never defined
behavior of CMSIS-RTOS. This allows testing to pass.

The RTX commit which caused this test to start failing is:
c3b123ef4256f65537e2597af475fc20ec9a383e
RTX5: updated MemoryPoolFree (removed count check) [SDCMSIS-801]

Note - Double freeing an element from a memory pool was never safe.
The error return value when double freeing was misleading since memory
corruption may still be occurring in that case. For more information
on this see SDCMSIS-801.
    @c1728p9
    c1728p9 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    c3f5b64 View commit details
    Browse the repository at this point in the history