Refactor arm_mpu to use CMSIS directly #8457
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #8457 +/- ##
=======================================
Coverage 64.61% 64.61%
=======================================
Files 421 421
Lines 40296 40296
Branches 6803 6803
=======================================
Hits 26037 26037
Misses 11126 11126
Partials 3133 3133Continue to review full report at Codecov.
|
|
CI is failing because the beetle doesn't have CMSIS headers. You might be able to fix by defining __MPU_PRESENT for that SoC, but I vaguely remember Vincenzo having some issues with that macro when he originally introduced MPU support into Zephyr. |
ca39018 to
cceaeb4
Compare
|
@MaureenHelm I added a commit to explicitly define the ARM MPU related macros for Beetle. It looks it is the only arm SOC that does not include CMSIS headers, so this is a straightforward workaround, IMO. |
nashif
approved these changes
Jun 18, 2018
This commit removes the macro definitions for MPU_CTRL register bitmasks, defined in arm_mpu.h, and modifies the MPU driver to directly use the equivalent macros defined in ARM CMSIS. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit removes the macro definitions for MPU_RBAR register bitmasks, defined in arm_mpu.h, and modifies the MPU driver to directly use the equivalent macros defined in ARM CMSIS. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit removes the macro definitions for MPU_RASR register bitmasks, defined in arm_mpu.h, and modifies the MPU driver to directly use the equivalent macros defined in ARM CMSIS. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
cceaeb4 to
4750bd6
Compare
Duplicate the CMSIS MPU-related macro definitions specifically for Beetle SOC which is is not compliant with ARM CMSIS and does not include the ARM CMSIS headers. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
4750bd6 to
3f6372b
Compare
andrewboie
approved these changes
Jun 19, 2018
MaureenHelm
approved these changes
Jun 19, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial PR towards implementing #8018.
This PR refactors the ARM MPU implementation to use the CMSIS macro definitions directly.