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

RTX5: Pre-processor defines used for assembly #6029

Merged
merged 4 commits into from Feb 16, 2018

Conversation

Projects
None yet
6 participants
@deepikabhavnani
Contributor

deepikabhavnani commented Feb 7, 2018

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.

@0xc0170 @bulislaw

Once this PR is merged to the master, SHA should be recorded in cmsis_importer.json script so that files are not over-written in next CMSIS update.

RTX5: 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.

@0xc0170 0xc0170 requested a review from bulislaw Feb 7, 2018

@@ -1,3 +0,0 @@
.equ __FPU_USED, 1

This comment has been minimized.

@0xc0170

0xc0170 Feb 7, 2018

Member

we do not need these removed files at all?

This comment has been minimized.

@deepikabhavnani

deepikabhavnani Feb 7, 2018

Contributor

No, we don’t need them. We can add FPU and other defines from tools, based on core selected or using -D option

This comment has been minimized.

@bulislaw

bulislaw Feb 7, 2018

Member

Let's not use -D if we can avoid it.

This comment has been minimized.

@deepikabhavnani

deepikabhavnani Feb 8, 2018

Contributor

Ideally FPU and DSP selection should be supported from tools, agree to that.

@0xc0170

0xc0170 approved these changes Feb 7, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Feb 7, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 7, 2018

Build : SUCCESS

Build number : 1085
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6029/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci

This comment has been minimized.

@bulislaw

These changes need to go to CMSIS repo first.

@mbed-ci

This comment has been minimized.

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 8, 2018

These changes will not be accepted by CMSIS repo as per my knowledge. Its same as cortex 4/7 processor where we have FPU defines and code is not same as CMSIS

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 8, 2018

@bulislaw - We need ARM-software/CMSIS_5@05fa9d3#diff-87a9bb8eedc11ec34f4697a894983dd4 changes from CMSIS for M23, do we have any plans to update CMSIS/RTX code in mbed-os

@0xc0170 0xc0170 added needs: work and removed needs: review labels Feb 8, 2018

Pulling in CMSIS commit 05fa9d3
Systick handler switch to secure/nonsecure issues addressed:
1. Switch to secure/nonsecure context save/restore is based on 6th bit in
LR register, correct the bug (R7 instead of LR was used for decision)
2. Prevent R7 from being corrupted in Sys_ContextSave
3. Branch when non-secure rather than secure
@bulislaw

This comment has been minimized.

Member

bulislaw commented Feb 9, 2018

These changes will not be accepted by CMSIS repo as per my knowledge. Its same as cortex 4/7 processor where we have FPU defines and code is not same as CMSIS

We will need to get rid of all changes to CMSIS/RTX soon to support cmsis-pack.
@theotherjimmy any ideas how do we make this changes while using packs?

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Feb 9, 2018

What are you asking exactly? Until the build system can build a cmsis-pack directly, we need to have some modifications to the CMSIS_5 repo to make it build with our build system.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Feb 9, 2018

@deepikabhavnani shall we add patches to our update script config file?

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 13, 2018

@bulislaw - Update the json file with SHA for this fix

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 13, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 13, 2018

Build : SUCCESS

Build number : 1132
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6029/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr cmonr merged commit 4145cc0 into ARMmbed:master Feb 16, 2018

17 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
mbed-ci-generic Build finished.
Details
travis-ci/docs/ Local docs testing has passed
Details
travis-ci/events/ Local events testing has passed
Details
travis-ci/littlefs/ Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL/ Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM/ Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC/ Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON/ Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP/ Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-SILICON_LABS/ Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM/ Local mbed2-STM testing has passed
Details

@deepikabhavnani deepikabhavnani deleted the deepikabhavnani:update_context_switch_files branch Feb 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment