-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
cmake: sysbuild: partition_manager: Fix domain handling issues #20479
Conversation
CI InformationTo view the history of this post, clich the 'edited' button above Inputs:Sources:sdk-nrf: PR head: ce094bb80f847c8c5d6a0438ecc92962579884eb more detailssdk-nrf:
Github labels
List of changed files detected by CI (1)
Outputs:ToolchainVersion: 4cff34261a Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
"this may cause images to use the original static partition manager file " | ||
"configuration data, which is incorrect. It is recommended that a pristine build be " | ||
"performed when a static partition manager file is updated." | ||
if(DEFINED PM_DOMAIN) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I'd suggest factoring out the common parts to something like:
if(DEFINED PM_DOMAIN)
set(static_configuration_checksum_var STATIC_PM_FILE_HASH_${PM_DOMAIN})
else()
set(static_configuration_checksum_var STATIC_PM_FILE_HASH)
endif()
if(NOT DEFINED ${static_configuration_checksum_var} OR NOT "${${static_configuration_checksum_var}}" STREQUAL "${static_configuration_checksum}")
if(DEFINED ${static_configuration_checksum_var})
message(WARNING "Static partition manager file has changed since this project was last configured, "
"this may cause images to use the original static partition manager file "
"configuration data, which is incorrect. It is recommended that a pristine build be "
"performed when a static partition manager file is updated."
)
endif()
set(${static_configuration_checksum_var} "${static_configuration_checksum}" CACHE INTERNAL
"nRF Connect SDK static partition manager file hash for ${static_configuration_file}" FORCE
)
endif()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applied
Fixes some issues around domain handling: - The domain was not got and was always supplied as empty - The wrong board was provided when using other board targets e.g. network core - Checksum handling was done with a singular file instead of once per domain, which would output an erroneous warning for other domains Signed-off-by: Jamie McCrae <[email protected]>
7d7ea1b
to
ce094bb
Compare
Fixes some issues around domain handling:
Seemingly not noticed that the domain handling for PM in sysbuild has never worked. This does now mean users need really silly named files like
pm_static_nrf5340dk_nrf5340_cpunet_CPUNET.yml
but that's PM.