modules: mcuboot: Disable Zephyr's MCUboot handling for child images #8

MarekPieta · 2023-06-21T10:57:51Z

Change disables Zephyr's MCUboot handling in child images. The NCS handles needed operations on its own. Change is needed to ensure consistency for main application image and child images.

Jira: NCSDK-22347

de-nordic · 2023-06-21T11:02:00Z

@nordicjm Can you take a look?

nordicjm · 2023-06-21T11:18:32Z

I do not think this is right and if the idea is to propagate up to the target ncs image, this will not work with sysbuild-ncs @tejlmand

MarekPieta · 2023-06-21T12:59:47Z

Rebased

MarekPieta · 2023-06-22T11:28:25Z

I do not think this is right and if the idea is to propagate up to the target ncs image, this will not work with sysbuild-ncs @tejlmand

It seems that we cannot remove the PARENT_SCOPE here (the information would no longer be propagated to Zephyr build system so it would not work as expected). I also understand that the solution is temporary, has its drawbacks and may need to be improved later (I copied it from the bottom of the CMakeLists.txt file to make handling mcuboot_secondary_app variant image consistent with the main application image).

rlubos · 2023-06-26T12:23:32Z

@nordicjm @tejlmand Any feedback wrt above comment?

Update manifest to point to the latest Zephyr and Mcuboot revisions after an upmerge. Include fixes in other repositories. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Since Zephyr 3.4 old Ztest API is deprecated and all tests with old API fail during building by Twister. Signed-off-by: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>

Pull alignment of UARTE CMSIS driver to nrfx 3.0.0 Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

New nrfx release added namespace prefix to RTC symbols. This patch aligns code to renamed symbols. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

nrfx 3.0.0 introduces multi instance support for I2S driver. Aligned I2S driver API used in application and Kconfig symbols to enable instance 0. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

Configuration macro for TIMER takes as a parameter frequency of the timer that user wants to set. This patch align macro call to that. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

GPIOTE driver has been complitely reworked in nrfx 3.0.0. Aligned code in a way that is suggested in migration notes from nrfx 2.11.0 to nrfx 3.0.0 that is available at https://github.com/NordicSemiconductor/nrfx/wiki/nrfx-2.11.0-to-3.0.0 Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

Change disables CONFIG_BOOT_SERIAL_IMG_GRP_HASH in MCUboot bootloader configuration of boards that use nRF52820 SoC. This is needed to reduce the memory consumption. Jira: NCSDK-21638 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

SNTP library no longer relies on POSIX network APIs/headers, and there's no need for date_time lib to rely on them either. Therefore, make the library indifferent on POSIX configuration by using zsock APIs directly. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Align zigbee codebase with upstream 15.4 API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Align NCS codebase with the new struct mgmt_callback format. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

sensor_read() is now a part of the public sensor AI, therefore need to use a different name in the sample to avoid conflict. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Align with the upstream SPI CS API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Align bluetooth mesh tests with the upstream API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE was deprecated and should no longer be used. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

To reduce RAM usage, `SENSOR_SHELL` is disabled. Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>

Required modules have been added to prj.conf. These were previously added by the shield defconfig but this has been deleted upstream. Signed-off-by: Andy Sinclair <andy.sinclair@nordicsemi.no>

CONFIG_BT_HOST_CCM, which is a dependency for CONFIG_BT_ENOCEAN is no longer enabled automatically by Zephyr, hence enable it manually in the project file. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Decrease number of USBD endpoints in DTS to reduce FLASH consumption. The MCUboot uses USB only for serial recovery over CDC ACM class. Jira: NCSDK-22309 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

Workaround for enabling the external flash on nRF9160 DK when using the nRF7002ek shield. Add external flash overlay to fix build failure. Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>

High drive mode is now enabled on SPI3 for the board definitions in Zephyr. Clean up unnecessary enabling of high drive mode in overlays. Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>

Change aligns the upload reset handling in the DFU MCUmgr application module to newly introduced public API of MCUmgr. Jira: NCSDK-21434 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

nrfx UARTE driver renamed member of the configuration structure and added new parameter to driver API. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

After the upmerge the sample no longer fit into FLASH on nrf5340dk_nrf5340_cpunet. Remove an obsolete workaround from the sample configuration to reduce sample FLASH footprint. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

This commit enables NRF_STORE_REBOOT_TYPE_GPREGRET Kconfig option for all Zigbee samples so the reset reason is stored between device reboot. Signed-off-by: Sebastian Draus <sebastian.draus@nordicsemi.no>

Change disables Zephyr's MCUboot handling in child images. The NCS handles needed operations on its own. Change is needed to ensure consistency for main application image and child images. Jira: NCSDK-22347 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

tejlmand

We should not start to manipulate Kconfig settings inside CMake.

Can result in unintended / unexpected errors, especially at NCS downstream users who are not aware of such manipulation.

tejlmand · 2023-06-29T11:01:19Z

modules/mcuboot/CMakeLists.txt

@@ -28,6 +28,10 @@ endif()

 if(CONFIG_BOOTLOADER_MCUBOOT)
  if (CONFIG_NCS_IS_VARIANT_IMAGE)
+    # NCS Handles everything regarding mcuboot, ensure Zephyr doesn't interfere.
+    # This is a temporary solution until Zephyr signing has been made more modular.
+    set(CONFIG_BOOTLOADER_MCUBOOT False PARENT_SCOPE)


this is not safe.

CONFIG_BOOTLOADER_MCUBOOT is a setting imported from the .config.
I acknowledge that it only impacts CMake configure time, and that CONFIG_BOOTLOADER_MCUBOOT is still set in autoconf.h and elsewhere in the system, such as python code loading the .config.

But in CMake, there can be customer code checking for this flag for other purposes than signing.

Has it been investigated why this happens for XIP images but not for other variant builds ?

Hi @tejlmand,

Yes, I am aware that the solution is not perfect and we should not manipulate Kconfig values inside CMake. I just make the behavior consistent with handling main application image - I actually used the same workaround (please take a look at the bottom of this CMakeLists.txt file, you will see the same hotfix applied for the main image):

# NCS Handles everything regarding mcuboot, ensure Zephyr doesn't interfere. # This is a temporary solution until Zephyr signing has been made more modular. set(CONFIG_BOOTLOADER_MCUBOOT False PARENT_SCOPE)

Could you provide a proper solution for the problem during the ongoing upmerge? Or maybe we could accept my temporary workaround and improve it later on (together with improving integration for the main application image)?

I see that.
Not fond of that solution either, but at least you are consistent with what we are already doing.

Solution accepted, but please do a rebase.

I need to open a new PR to sdk-nrf main branch. Give me moment.

MarekPieta · 2023-07-04T14:10:52Z

Upmerge is done already, opened PR to main that introduces the change: nrfconnect#11696.
Closing this one

github-actions bot added the changelog-entry-required label Jun 21, 2023

MarekPieta force-pushed the mcuboot_sign_fix branch from 4f1317f to 1c77429 Compare June 21, 2023 10:58

de-nordic approved these changes Jun 21, 2023

View reviewed changes

rlubos force-pushed the upmerge-19-06-2023 branch from 2697630 to e234d92 Compare June 21, 2023 12:19

rlubos self-requested a review as a June 21, 2023 12:19

MarekPieta force-pushed the mcuboot_sign_fix branch from 1c77429 to 821993a Compare June 21, 2023 12:59

rlubos force-pushed the upmerge-19-06-2023 branch from e234d92 to 8d03319 Compare June 21, 2023 14:56

MarekPieta force-pushed the mcuboot_sign_fix branch from 821993a to d104746 Compare June 22, 2023 06:47

rlubos force-pushed the upmerge-19-06-2023 branch from ef90798 to a4ed047 Compare June 22, 2023 14:51

MarekPieta force-pushed the mcuboot_sign_fix branch from d104746 to 9c9ce49 Compare June 22, 2023 16:05

rlubos force-pushed the upmerge-19-06-2023 branch 2 times, most recently from 08d72f0 to 63ab81a Compare June 26, 2023 08:51

MarekPieta force-pushed the mcuboot_sign_fix branch from 9c9ce49 to e6244cc Compare June 26, 2023 12:21

rlubos force-pushed the upmerge-19-06-2023 branch 2 times, most recently from 3433776 to 0f70010 Compare June 26, 2023 13:01

MarekPieta force-pushed the mcuboot_sign_fix branch from e6244cc to 5e26627 Compare June 27, 2023 06:56

rlubos and others added 9 commits June 27, 2023 10:56

manifest: Regular Zephyr upmerge

759aa01

Update manifest to point to the latest Zephyr and Mcuboot revisions after an upmerge. Include fixes in other repositories. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

scripts: quarantine: add tests with old Ztest API

76d955f

Since Zephyr 3.4 old Ztest API is deprecated and all tests with old API fail during building by Twister. Signed-off-by: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>

manifest: Update sdk-trusted-firmware-m revision

10bb43f

Pull alignment of UARTE CMSIS driver to nrfx 3.0.0 Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

dm: time: Replace depricated RTC symbols to existing in nrfx3.0

82de4d6

New nrfx release added namespace prefix to RTC symbols. This patch aligns code to renamed symbols. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

applications: nrf5340_audio: Align to multi instance I2S driver

1083704

nrfx 3.0.0 introduces multi instance support for I2S driver. Aligned I2S driver API used in application and Kconfig symbols to enable instance 0. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

debug: cpu_load: Align TIMER configuration macro usage

4c6549c

Configuration macro for TIMER takes as a parameter frequency of the timer that user wants to set. This patch align macro call to that. Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>

rlubos and others added 15 commits June 27, 2023 10:56

zigbee: Align with upstream 15.4 API changes

6867b12

Align zigbee codebase with upstream 15.4 API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

mgmt: mcumgr: Align codebase with the new callback format

446174b

Align NCS codebase with the new struct mgmt_callback format. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

samples: nrf9160: lwm2m_client: Prevent name collission with sensor API

2adcdba

sensor_read() is now a part of the public sensor AI, therefore need to use a different name in the sample to avoid conflict. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

lib: st25r3911b: Align with upstream SPI CS changes

4068aae

Align with the upstream SPI CS API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

bluetooth: mesh: Align with the upstream API changes

6ab2e9f

Align bluetooth mesh tests with the upstream API changes. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

libc: Avoid using deprecated MINIMAL_LIBC_MALLOC_ARENA_SIZE

ee70542

CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE was deprecated and should no longer be used. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

samples: bluetooth: peripheral_mds: Disable SENSOR_SHELL

7a89e3b

To reduce RAM usage, `SENSOR_SHELL` is disabled. Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>

samples: pmic: npm1300_fuel_gauge: Added Kconfig modules

753020e

Required modules have been added to prj.conf. These were previously added by the shield defconfig but this has been deleted upstream. Signed-off-by: Andy Sinclair <andy.sinclair@nordicsemi.no>

samples: bluetooth: mesh: silvair_enocean: Fix Kconfig dependencies

f823e02

CONFIG_BT_HOST_CCM, which is a dependency for CONFIG_BT_ENOCEAN is no longer enabled automatically by Zephyr, hence enable it manually in the project file. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

applications: nrf_desktop: Reduce MCUboot FLASH size (serial recovery)

b08ef91

Decrease number of USBD endpoints in DTS to reduce FLASH consumption. The MCUboot uses USB only for serial recovery over CDC ACM class. Jira: NCSDK-22309 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

applications: asset_tracker_v2: Fix nrf7002ek_wifi

ab7c850

Workaround for enabling the external flash on nRF9160 DK when using the nRF7002ek shield. Add external flash overlay to fix build failure. Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>

boards: Clean up high drive mode for nrf9160dk and nrf9161dk

da06dc8

High drive mode is now enabled on SPI3 for the board definitions in Zephyr. Clean up unnecessary enabling of high drive mode in overlays. Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>

applications: nrf_desktop: Align upload reset in DFU MCUmgr module

c9a5a25

Change aligns the upload reset handling in the DFU MCUmgr application module to newly introduced public API of MCUmgr. Jira: NCSDK-21434 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

rlubos force-pushed the upmerge-19-06-2023 branch from 0f70010 to ff404ed Compare June 27, 2023 08:56

sebastiandraus and others added 2 commits June 27, 2023 14:41

zigbee: Enable NRF_STORE_REBOOT_TYPE_GPREGRET by default

519307f

This commit enables NRF_STORE_REBOOT_TYPE_GPREGRET Kconfig option for all Zigbee samples so the reset reason is stored between device reboot. Signed-off-by: Sebastian Draus <sebastian.draus@nordicsemi.no>

MarekPieta force-pushed the mcuboot_sign_fix branch from 5e26627 to 4fa6e54 Compare June 28, 2023 05:34

rlubos force-pushed the upmerge-19-06-2023 branch 2 times, most recently from c58b5f8 to 65f911c Compare June 28, 2023 13:11

tejlmand suggested changes Jun 29, 2023

View reviewed changes

rlubos force-pushed the upmerge-19-06-2023 branch 3 times, most recently from c71c583 to dd3123d Compare July 3, 2023 13:10

MarekPieta closed this Jul 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

modules: mcuboot: Disable Zephyr's MCUboot handling for child images #8

modules: mcuboot: Disable Zephyr's MCUboot handling for child images #8

MarekPieta commented Jun 21, 2023

de-nordic commented Jun 21, 2023

nordicjm commented Jun 21, 2023

MarekPieta commented Jun 21, 2023

MarekPieta commented Jun 22, 2023 •

edited

Loading

rlubos commented Jun 26, 2023

tejlmand left a comment

tejlmand Jun 29, 2023

MarekPieta Jun 29, 2023

MarekPieta Jun 29, 2023

tejlmand Jul 4, 2023

MarekPieta Jul 4, 2023

MarekPieta commented Jul 4, 2023

modules: mcuboot: Disable Zephyr's MCUboot handling for child images #8

modules: mcuboot: Disable Zephyr's MCUboot handling for child images #8

Conversation

MarekPieta commented Jun 21, 2023

de-nordic commented Jun 21, 2023

nordicjm commented Jun 21, 2023

MarekPieta commented Jun 21, 2023

MarekPieta commented Jun 22, 2023 • edited Loading

rlubos commented Jun 26, 2023

tejlmand left a comment

Choose a reason for hiding this comment

tejlmand Jun 29, 2023

Choose a reason for hiding this comment

MarekPieta Jun 29, 2023

Choose a reason for hiding this comment

MarekPieta Jun 29, 2023

Choose a reason for hiding this comment

tejlmand Jul 4, 2023

Choose a reason for hiding this comment

MarekPieta Jul 4, 2023

Choose a reason for hiding this comment

MarekPieta commented Jul 4, 2023

MarekPieta commented Jun 22, 2023 •

edited

Loading