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.

Sign up for GitHub

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

Jump to bottom

boot/zephyr/nrf_cleanup: cleanup uarte pins #303

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open

boot/zephyr/nrf_cleanup: cleanup uarte pins #303

wants to merge 38 commits into from

Conversation

nvlsianpu
Copy link
Contributor

Added procedure which does configure UARTE pins to the default states. This allows to reduce power consumption if pin is floating.

Ref.: NCSIDB-1194

oyvindronningstad and others added 9 commits March 4, 2024 10:10
@oyvindronningstad @jfischer-no
[nrf fromtree] zcbor: Copy source and header files
b137da6 
from zcbor 0.8.0

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit ad5f0ac)
(cherry picked from commit 51a7821)
@oyvindronningstad @jfischer-no
[nrf fromtree] zcbor: Add copy notice to all copied files
0c539f6 
And update script

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit a899390)
(cherry picked from commit f29720b)
@oyvindronningstad @jfischer-no
[nrf fromtree] boot_serial: Adapt to API changes in zcbor 0.8.0
fc20e9b 
New arguments in zcbor_new_state are set to NULL/0 because they are
only needed when using the zcbor_unordered_map API.

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit 63ddb71)
(cherry picked from commit b16b1a9)
@oyvindronningstad @jfischer-no
[nrf fromtree] zcbor: Copy source and header files
e5d5708 
from zcbor 0.8.1

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit c8d213a)
(cherry picked from commit ff23755)
@oyvindronningstad @jfischer-no
[nrf fromtree] boot_serial: Adapt to zcbor 0.8.x
9e03ad4 
Change one _term to _lit that was missed earlier.

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit 205d7e5)
(cherry picked from commit 55a0f64)
@michalek-no @jfischer-no
[nrf fromtree] boot: zephyr: moonlight watchdogs
df01761 
adding WATCHDOG_FEED support for WDT30 and WDT31

Signed-off-by: Mateusz Michalek <[email protected]>
(cherry picked from commit c3a72e9)
Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit b2b1677)
@michalek-no @jfischer-no
[nrf fromtree] zephyr: Add NRF54L configuration
27fc8d7 
Adds default Kconfig configuration that allows to build MCUboot
for NRF54L.
Currently this configuration turns off WDT and FPROTECT,
which is TODO to fix.

Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Mateusz Michalek <[email protected]>
(cherry picked from commit 4b4cc85)
Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit 73e1106)
@nvlsianpu @jfischer-no
[nrf fromlist] zephyr/boards: nrf54l15pdk_nrf54l15_cpuapp config
6a9b75f 
Upstream PR: mcu-tools/mcuboot#1901

Renamed the DK config file to proper name.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit bd1464f69934ff37f91321da397fb1398907c946)
(cherry picked from commit 42a1eb6)
@de-nordic @jfischer-no
[nrf fromtree] boot: Fix swap-move algorithm failing to validate mult…
f82a032 
…i-image

In multi image swap validation of images could fail due to
headers being incorrectly re-read from storage.

Fixes #1768

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 6f7f873)
(cherry picked from commit cb64eca)
@nvlsianpu nvlsianpu force-pushed the bugfix/NCSIDB_1194 branch from df7b400 to 546fcfc Compare March 6, 2024 08:48
@nvlsianpu nvlsianpu added the bugfix Fixes a known bug label Mar 6, 2024
@nvlsianpu nvlsianpu added this to the ncs-2.6.0 milestone Mar 6, 2024
@NordicBuilder NordicBuilder mentioned this pull request Mar 6, 2024
Closed
@nvlsianpu nvlsianpu force-pushed the bugfix/NCSIDB_1194 branch from 546fcfc to 7310e4f Compare March 6, 2024 13:07
vidarbe
vidarbe approved these changes Mar 6, 2024
View reviewed changes
boot/zephyr/nrf_cleanup.c Outdated Show resolved Hide resolved
@nvlsianpu nvlsianpu force-pushed the bugfix/NCSIDB_1194 branch from 13284bc to 87b6c49 Compare March 6, 2024 15:09
thst-nordic and others added 11 commits March 6, 2024 16:30
@thst-nordic @jfischer-no
[nrf noup] ci: add downstream-only NCS customizations
4d7e568 
Add Jenkinsfile, .gitlint, and backport workflow files.

Signed-off-by: Thomas Stilwell <[email protected]>
Signed-off-by: Ulrich Myhre <[email protected]>
Signed-off-by: Chris Bittner <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 39f179d)
@carlescufi @jfischer-no
[nrf noup] github: Add a commit tags check workflow
786e351 
Use the generic commit-tags action to provide sauce tag checks.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit d9ed9a6)
@sigvartmh @jfischer-no
[nrf noup] zephyr: Remove duplication from cmake
5c94965 
Removes the `add_subdirectory`
of nrfxlib it will still check that the nrfxlib is located outside
the mcuboot directory.

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Emil Obalski <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit cf90d55)
@mbolivar-nordic @jfischer-no
[nrf noup] zephyr: add 'minimal' configuration files
64740f7 
Add prj_minimal.conf, a Kconfig fragment to be used for minimally
sized image production. The minimal fragment has been simplified for
only external crypto.

Move partition sizing into Kconfig to be consistent with the method
used by b0.

Using this fragment with prj_minimal.conf makes MCUboot < 16kB for
all nRF devices (9160 still needs 32kB partition).

Ref: NCSDK-6704
Signed-off-by: Stephen Stauts <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 5b6e0b2)
@bjda @jfischer-no
[nrf noup] boards: add support for Thingy:91
de32681 
Adds project configurations for the two systems on the Thingy:91
(PCA-20035) board.

The bootloader that is factory-programmed on thing91 does not support
ECDSA signature type. Hence this commit also sets the signature type
to RSA for applications built for Thingy:91.

Signed-off-by: Bernt Johan Damslora <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Jon Helge Nistad <[email protected]>
Signed-off-by: Balaji Srinivasan <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 74bb73a)
@sigvartmh @jfischer-no
[nrf noup] loader: work-around for multi-image builds
5cf8423 
Seems multi-image dependencies are not supported for multi-image in
NCS yet. This is a workaround which reverts some lines to restore
previous MCUboot behavior, so that Immutable bootloader + MCUBoot type
builds will work.

Ref. NCSDK-8681

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit e02925a)
@sigvartmh @jfischer-no
[nrf noup] boot: Add shared crypto for ECDSA and SHA
55683e3 
* Add functions for ecdsa_verify_secp256r1 and sha256 to use the shared
crypto API
* Add Kconfig and CMake variables for selecting shared crypto when using
ecdsa
* Add custom section to project for placing the API section in the
correct location in flash
* Add kconfig fragment for using external crypto

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Emil Obalski <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 5f71e80)
(cherry picked from commit beebb23)
@de-nordic @jfischer-no
[nrf noup] crypto: ecdsa: Add required signature decoding
ba55561 
The CC310 and bl_crypto require decoded signature instead of raw ASN.1

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 685c58e)
@sigvartmh @jfischer-no
[nrf noup] crypto: ecdsa: Fix shared crypto MCUBoot EXT_ABI
a0c21e2 
After the upmerge using external crypto from NSIB in MCUBoot resulted in
build failures. This commit fixes the build failures but also fixes a
change in the API call which resulted in `-102` error when calling the
verify function.

Ref. NCSDK-23994

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 4015754)
@Vge0rge @jfischer-no
[nrf noup] zephyr: Set at least provide EXT_API
fcd7281 
-This sets the provide EXT_API to be at least
 optional when the external_crypto is being used.

Ref: NCSDK-12021

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit c8e7fbd)
@Damian-Nordic @jfischer-no
[nrf noup] zephyr: Restore default RTC user channel count
a01d30a 
The default value of CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT
for nRF52 SOCs has been changed from 0 to 3, but it makes
MCUBoot get stuck on erasing flash pages when swapping two
images. Restore the previous value until the RTC issue is
resolved (see NCSDK-14427)

Signed-off-by: Damian Krolik <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 9fa2c07)
sigvartmh and others added 16 commits March 7, 2024 12:34
@sigvartmh @jfischer-no
[nrf noup] boot: nrf53-specific customizations
2009587 
- Add network core bootloader implementation

  Enables network core updates of nrf53 using MCUBoot by identifying
  images through their start addresses. Also implements the control and
  transfer using the PCD module.

- Add support for multi image DFU using partition manager.

- Add check for netcore addr if NSIB is enabled so netcore updates works

- boot: zephyr: move thingy53_nrf5340_cpuapp.conf downstream

  Moved the board configuration for Thingy:53 Application Core to the
  nRF Connect SDK MCUboot downstream repository. The configuration file
  contains references to the Kconfig modules that are only available in
  the nRF Connect SDK. The current configuration is set up to work in the
  nRF Connect SDK environment and cannot be used upstream.

- pm: enable ram flash partition using common flag

  This patch makes mcuboot_primary_1 ram-flash partition
  selectable using CONFIG_NRF53_MCUBOOT_PRIMARY_1_RAM_FLASH
  property. This is needed since CONFIG_NRF53_MULTI_IMAGE_UPDATE
  become not only configuration which requires that partition.

- MCUBoot configures USB CDC by its own. There is no need for
  BOARD_SERIAL_BACKEND_CDC_ACM option to configure anything which is
  later overwritten anyway.

  Jira: NCSDK-18596

Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Emil Obalski <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Kamil Piszczek <[email protected]>
Signed-off-by: Ole Sæther <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Simon Iversen <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Mateusz Kapala <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 2bbd3b1)
(cherry picked from commit 0098451)
@nvlsianpu @jfischer-no
[nrf noup] zephyr: clean peripherals state before boot
1b0aa58 
Do some cleanup of nRF peripherals. This is necessary since Zephyr
doesn't have any driver deinitialization functionality, and we'd like
to leave peripherals in a more predictable state before booting the
Zephyr image. This should be re-worked when the zephyr driver model
allows us to deinitialize devices cleanly before jumping to the
chain-loaded image.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Øyvind Rønningstad <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 4c8e041)
@sigvartmh @jfischer-no
[nrf noup] zephyr: Clean up non-secure RAM if enabled
83bc352 
To ensure that MCUBoot does not leak keys or other material through
memory to non-secure side we clear the memory before jumping to the next
image.

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Ole Sæther <[email protected]>
(cherry picked from commit b8a544d)
(cherry picked from commit 7f2386f)
@chrta @jfischer-no
[nrf noup] loader: Fix reading reset addr to support ext flash
5bdac09 
When mcuboot_secondary is on external flash, the image header cannot
dircetly be accessed via secondary_fa->fa_off. Instead the provided
function boot_img_hdr() is used now.
Additionally a similar issue is present when trying to read the address
of the reset handler. For this flash_area_read() is used now.

With this patch is possible to have the update partiton
mcuboot_secondary on external flash and update a updatable
bootloader (mcuboot) in s0 and/or s1.

Signed-off-by: Christian Taedcke <[email protected]>
Signed-off-by: Ole Sæther <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 9403865)
@nordicjm @jfischer-no
[nrf noup] zephyr: Fix path variables
d9d3804 
Fixes path variables to use the proper Zephyr module variables

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit be3e7c6)
@nordicjm @jfischer-no
[nrf noup] loader: Fix missing PCD define check
6024d0a 
Fixes a missing PCD define check, an image might have the
network core partition layout set but if PCD support is not
enabled then it should not assume that PCD support is part
of mcuboot.

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 5932630)
@sigvartmh @jfischer-no
[nrf noup] boot: Add support for NSIB and multi-image
b4464ad 
This adds support for using both NSIB and the multi-image configuration
in MCUboot. Before this was not possible due to upgradable bootloader
support through NSIB was using the `UPDATEABLE_IMAGE_NUMBER`
configuration to update the updateable bootloader.

In this commit we change from using `FLASH_AREA_IMAGE_PRIMARY` to get
the flash area ID to using the bootloader state where we set the flash
area ID of the free updatable bootloader slot if the image is intended
for this slot.

Ref. NCSDK-19223
Ref. NCSDK-23305

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 03af90f)
(cherry picked from commit 0d43674)
@de-nordic @jfischer-no
[nrf noup] sysflash: Move partition manager definitions to pm_sysflash.h
418b6fe 
Making sysflash.h and pm_sysflash.h more readable.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit c3b33eb)
@de-nordic @jfischer-no
[nrf noup] sysflash: Add support for three images
7b87633 
The commit modifies pm_sysflash.h to add support for three
application images.

Ref. NCSDK-19223

Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
(cherry picked from commit 77c7e25)
(cherry picked from commit d700515)
@de-nordic @jfischer-no
[nrf noup] loader: Do not check reset vector for XIP image
8e373cc 
The XIP image, 2, does not have reset vector.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 30181d8)
@nordicjm @jfischer-no
[nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild
90a91e0 
Puts the flash simulation configurtion into cache variables that can
be used by other applications and CMake code to know specifics on
the simulated flash details

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit c19337f)
@sigvartmh @jfischer-no
[nrf noup] zephyr: Boot even if EXT_ABI is not provided
4b36f9f 
This removes the `return;` to ensure that the application is booted even
if EXT_ABI is not provided to the application because it does not
include `FW_INFO`.

Added a bit more description to the error messages when FW_INFO is not
found and EXT_ABI is not able to be provided to the next image.

Ref. NCSDK-24132

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit e6e72a0)
@sigvartmh @jfischer-no
[nrf noup] loader: Add firmware version check downgrade prevention
c5aadd7 
For nRF53, the only existing version number metadata is stored in the
`firmware_info` structure in the network core. This utilizes PCD to read
out the version number and compares it against the version number found
in the secondary slot for the network core.

Ref. NCSDK-21379

Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 4441695)
@nvlsianpu @jfischer-no
[nrf noup] loader: introduced cleanup of unusable secondary slot
ed3a0c2 
Added procedure which clean-up content of all the secondary slot
which contains valid header but couldn't be assigned to any of
supported primary images.
This behavior is needed when configuration allows to use one secondary
slot for collecting image for multiple primary slots.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nika-nordic @jfischer-no
[nrf noup] boards: thingy53: disable GPIO ISR support
8bb8567 
Change disables GPIO interrupt support in Zephyr GPIO driver,
which is not obligatory for MCUboot.
This is needed to reduce memory footprint.

Signed-off-by: Nikodem Kastelik <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 69805fa)
@maxd-nordic @jfischer-no
[nrf noup] boards: thingy91x: add board config
3c2f2ff 
This patch adds board configuration for the Thingy:91 X.

Signed-off-by: Maximilian Deubel <[email protected]>
(cherry picked from commit a9d5fa7)
de-nordic
de-nordic approved these changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@de-nordic de-nordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look OK.
Could we have the commits squashed?

@nvlsianpu nvlsianpu force-pushed the bugfix/NCSIDB_1194 branch from 87b6c49 to 3b465f9 Compare March 11, 2024 15:35
@nvlsianpu
[nrf noup] boot/zephyr/nrf_cleanup: cleanup uarte pins
f687068 
Added procedure which does configure UARTE pins to
the default states. This allows to reduce power consumption
if pin is floating.

clean-up UARTE only if its driver was enabled

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nvlsianpu nvlsianpu force-pushed the bugfix/NCSIDB_1194 branch from 3b465f9 to f687068 Compare March 11, 2024 16:14
@shanthanordic shanthanordic modified the milestones: ncs-2.6.0, ncs-2.7.0 Mar 15, 2024
@anangl
Copy link
Contributor

anangl commented Jun 6, 2024

@nvlsianpu Can you rebase this, please?

@shanthanordic
Copy link

moving it out of NCS 2.7.0 @nvlsianpu FYI

@shanthanordic shanthanordic removed this from the ncs-2.7.0 milestone Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@de-nordic de-nordic de-nordic approved these changes

@vidarbe vidarbe vidarbe approved these changes

@sigvartmh sigvartmh sigvartmh approved these changes

Assignees
No one assigned
Labels
bugfix Fixes a known bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.