optee: resolve include clash with meta-arm #581
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
meta-arm already provides optee. Some BSP rely on this version of optee rather than the one provided by lmp. Include files, such as optee-client.inc, clash with meta-arm which the bb recipe from meta-arm use the include from meta-lmp. Append "-fio" to includes provided by meta-lmp so they don't clash with meta-arm. Signed-off-by: Jerome Brunet <[email protected]>
|
Thx, Can you put this on the honister support branch too please ? |
Honister is now in sync with master, which includes your change. Manifest is not yet updated to reflect the latest meta-lmp but we should be doing that later today (just landing a few other minor fixes first). |
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.
meta-arm already provides optee. Some BSP rely on this version of optee
rather than the one provided by lmp. Include files, such as
optee-client.inc, clash with meta-arm which the bb recipe from meta-arm use
the include from meta-lmp.
Append "-fio" to includes provided by meta-lmp so they don't clash with
meta-arm.