zephyr: fix mcuboot can't link into boot-partition #14620
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
Objective of the path is to allow to select by the application to link into the chosen code-partition. Introduced USE_CODE_PARTITION will be set by bootloader project. fixes zephyrproject-rtos#14566 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
nvlsianpu
added a commit
to nvlsianpu/mcuboot
that referenced
this pull request
Mar 18, 2019
Select the code partition as the target for link into. This patch together with zephyrproject-rtos/zephyr#14620 fixes the issue which was imposed while zephyr moves DTC before Kconfig processing in its build process. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
nvlsianpu
requested review from
SebastianBoe,
galak,
carlescufi and
lemrey
and removed request for
SebastianBoe
This was referenced Mar 18, 2019
carlescufi
reviewed
Mar 18, 2019
| config FLASH_LOAD_OFFSET | ||
| hex "Kernel load offset" | ||
| default $(dt_hex_val,DT_CODE_PARTITION_OFFSET) if BOOTLOADER_MCUBOOT | ||
| default $(dt_hex_val,DT_CODE_PARTITION_OFFSET) if USE_CODE_PARTITION |
There was a problem hiding this comment.
Why not add a new function in kconfigfunctions.py that conditionally returns DT_CODE_PARTITION_OFFSET or 0? is it not possible?
There was a problem hiding this comment.
It's better to write Kconfig than python, isn't it?
Not sure if I understood the problem/motivation here.
There was a problem hiding this comment.
IMO it is more legible how it is implemented now.
@carles: were you thinking about:
default $(dt_hex_val1_or_val2, DT_CODE_PARTITION_OFFSET, 0, USE_CODE_PARTITION)
probably about somethings different
There was a problem hiding this comment.
nrF9160 NS board has, also, a similar setting, i.e. force using code partition.
I wonder if we could integrate this solution to the 9160 configuration, too
galak
approved these changes
Mar 18, 2019
galak
added
bug
carlescufi
approved these changes
Mar 19, 2019
nvlsianpu
added a commit
to mcu-tools/mcuboot
that referenced
this pull request
Mar 19, 2019
Select the code partition as the target for link into. This patch together with zephyrproject-rtos/zephyr#14620 fixes the issue which was imposed while zephyr moves DTC before Kconfig processing in its build process. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
nvlsianpu
added a commit
to nrfconnect/sdk-mcuboot
that referenced
this pull request
Mar 29, 2019
Select the code partition as the target for link into. This patch together with zephyrproject-rtos/zephyr#14620 fixes the issue which was imposed while zephyr moves DTC before Kconfig processing in its build process. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
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.
Objective of the path is to allow to select by the application
to link into the chosen code-partition.
Introduced USE_CODE_PARTITION will be set by bootloader project.
fixes #14566
Signed-off-by: Andrzej Puzdrowski andrzej.puzdrowski@nordicsemi.no