Skip to content
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

manifest: bootloader: mcuboot: Fix wrong use of if defined #11574

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

osaether
Copy link
Contributor

The file nrf_cleanup.c has
#if defined(USE_PARTITION_MANAGER)
Which is true even if USE_PARTITION_MANAGER=n.
This must be changed to "#if USE_PARTITION_MANAGER" for correct behaviour.

Ref: NCSIDB-987

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Jun 20, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jun 20, 2023

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@4e84f31 (upmerge-tmp) nrfconnect/sdk-mcuboot@823fd36 (main) nrfconnect/sdk-mcuboot@4e84f311..823fd369

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@osaether osaether force-pushed the fix_if_defined_bug branch 2 times, most recently from 0cca482 to a485cf2 Compare June 20, 2023 08:40
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jun 20, 2023

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
test-ci-nrfconnect-boot-fw-update X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@osaether osaether force-pushed the fix_if_defined_bug branch 2 times, most recently from 81de263 to ddd6130 Compare June 20, 2023 08:46
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@osaether osaether force-pushed the fix_if_defined_bug branch 5 times, most recently from f5a2f46 to 942a436 Compare June 28, 2023 09:26
@osaether osaether force-pushed the fix_if_defined_bug branch 5 times, most recently from 3dd90b2 to 4a4cdc6 Compare July 5, 2023 07:23
@osaether osaether requested review from hakonfam, oyvindronningstad and sigvartmh and removed request for hakonfam July 6, 2023 07:09
@osaether osaether force-pushed the fix_if_defined_bug branch 4 times, most recently from ff7dcc1 to 71fbbc5 Compare July 11, 2023 12:05
@NordicBuilder NordicBuilder removed the DNM label Jul 11, 2023
The file nrf_cleanup.c has
"#if defined(USE_PARTITION_MANAGER)"
Which is true even if USE_PARTITION_MANAGER=n.
This must be changed to "#if USE_PARTITION_MANAGER" for correct
behaviour.

Ref: NCSIDB-987

Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
@nordicjm nordicjm merged commit 58b7f83 into nrfconnect:main Jul 12, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-mcuboot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants