nrf_modem: fix binary linking for upmerge 25-03-2024 #1278
Closed
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
MirkoCovizzi
changed the title
MirkoCovizzi
force-pushed
the
upmerge
branch
2 times, most recently
from
04477f7 to
4b2642d
Compare
MirkoCovizzi
changed the title
MirkoCovizzi
force-pushed
the
upmerge
branch
2 times, most recently
from
b6bbb84 to
0f38d84
Compare
nrf_modem/CMakeLists.txt
Outdated
|
|
||
| if(NOT arch_soc_dir MATCHES "nRF9160") | ||
| string(REGEX REPLACE "nRF91[0-9]*" "nRF9120" arch_soc_dir ${arch_soc_dir}) | ||
| if(NOT arch_soc_dir MATCHES "^nRF9160$") |
Contributor
There was a problem hiding this comment.
Suggested change
| if(NOT arch_soc_dir MATCHES "^nRF9160$") | |
| if(${CONFIG_SOC} MATCHES "^nrf91[356]1$") |
Contributor
Author
There was a problem hiding this comment.
Actually, I think we can completely remove the if, because the substitution happens only if the regex matches.
This commit updates the cmake configuration file to recognize the new SOC names defined with HWMv2. Signed-off-by: Mirko Covizzi <[email protected]>
eivindj-nordic
approved these changes
Apr 4, 2024
Contributor
eivindj-nordic
left a comment
eivindj-nordic
left a comment
There was a problem hiding this comment.
Looks good to me, though it has to be linked or cherry-picked in the upmerge.
Contributor
Author
I'm aware, I've already notified the upmerge maintainer. |
anhmolt
approved these changes
Apr 4, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This commit updates the cmake configuration file to
recognize the new SOC names defined with HWMv2.