ext: mcux: Reorganize imported drivers into soc family subfolders #7163
Conversation
This file contains hidden or 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
A template for documenting non-apache licensed components was introduced after mcux was originally imported. Update the README to follow the template in doc/contribute/code_component_README. Signed-off-by: Maureen Helm <[email protected]>
We have been combining imported mcux drivers into a flattened directory structure to maximize driver reuse, but the introduction of additional nxp soc families (lpc and imx) to zephyr has introduced driver naming conflicts. This caused us to rename and modify imported files, such as fsl_gpio.c/h, to make them unique across all three nxp soc families. This makes updating the the mcux drivers complicated, especially for the lpc family. Reoganize the mcux drivers into soc family subfolders, so we can just copy all the drivers from an mcux distribution (which is done on an soc-basis) into the appropriate soc family folder. Undo all of the naming changes that occurred when lpc and imx drivers were originally imported. Undo the accidental squashing of the kinetis watchdog and dcdc drivers that occurred when the imx drivers were introduced. The drawback to this approach is that we have duplicate files when the same hw ip modules exist in multiple soc families, however there are only few cases where this occurs, such as fsl_lpuart and fsl_trng. Signed-off-by: Maureen Helm <[email protected]>
The lpc54114 soc.c file included clock_config.h unnecessarily. Signed-off-by: Maureen Helm <[email protected]>
We have never used the mcux clock_config.c/h files, so remove them. We configure clocks in soc.c instead to allow more options with Kconfigs. Signed-off-by: Maureen Helm <[email protected]>
MaureenHelm
added
platform: NXP
Codecov Report
@@ Coverage Diff @@
## master #7163 +/- ##
==========================================
- Coverage 58.59% 58.59% -0.01%
==========================================
Files 464 464
Lines 47483 47483
Branches 8796 8796
==========================================
- Hits 27822 27821 -1
- Misses 15823 15824 +1
Partials 3838 3838
Continue to review full report at Codecov.
|
galak
approved these changes
Apr 24, 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.
Takes the first four commits from #6633 to reorganize the mcux drivers into soc family subfolders and do some minor cleanup of unused files. This was initially done to simplify the process of updating mcux drivers to newer versions, but it also fixed some accidental squashing of drivers due to naming conflicts between imx and kinetis. The kinetis watchdog driver was one of those, and we need it restored for the watchdog api review in #7007.