MCU boot for pca20035 #44

joakimtoe · 2019-06-28T14:25:12Z

No description provided.

This updates all references from github.com/runtimeco to github.com/JuulLabs-OSS in docs and yml files. Signed-off-by: Fabio Utzig <utzig@apache.org>

Because the amount of features that the simulator is testing is growing, the test time is taking a long time. This distributes simulator's tests over three travis machines to decrease test time. Add options to defined tests that run one-by-one in a sequential fashion by defining them in $SINGLE_FEATURES, and allow defining features that should run together by providing a string of ',' separated list of multiple tests in $MULTI_FEATURES. Signed-off-by: Fabio Utzig <utzig@apache.org>

Signed-off-by: Fabio Utzig <utzig@apache.org>

Use existing global var instead of using locally declared variable, reducing RAM usage. Signed-off-by: Fabio Utzig <utzig@apache.org>

Also add overwrite-only + encrypted tests to travis-ci. Signed-off-by: Fabio Utzig <utzig@apache.org>

Throw exception on values that are less than the minimum acceptable size of 32 bytes. Signed-off-by: Fabio Utzig <utzig@apache.org>

Generating images with no signature or encryption was broken by commit 06b77b8 This allows generating images with just sha256 again, and fixes a few leftovers from the imghash TLV change. Signed-off-by: Fabio Utzig <utzig@apache.org>

TLV types don't need to list KEYHASH because it's already added by any signature TLV. Total sizes were missing the KEYHASH amount. Add a new TLV for images signed with RSA and encrypted with RSA-OAEP. Signed-off-by: Fabio Utzig <utzig@apache.org>

This makes it easier to choose the mbedTLS config file when multiple features share files. Signed-off-by: Fabio Utzig <utzig@apache.org>

Signed-off-by: Fabio Utzig <utzig@apache.org>

This adds an HDR_SIZE constant to the simulator which allows for easier testing of images with different header sizes. Signed-off-by: Fabio Utzig <utzig@apache.org>

Encrypted images were known to be failing when the header size was larger than 256 bytes because of incorrect handling of blocks sent to decryption and hashing routines. An assert was previously added to check the header and read block sizes matched to avoid incurring into the know error, but it was incorrectly enabled also for non-encrypted images. Now the handling of the header, which is not encrypted, is correctly separated from the handling of the remaining image, when encryption is used, to avoid ever sending header data into the decryption routines. Signed-off-by: Fabio Utzig <utzig@apache.org>

For Zephyr the default mbedTLS mempool size for RSA-2048 signing was not enough to allow for the calculations done by RSA-2048-OAEP (encrypted images), so when encrypted image support is enabled, increase it to a value that is known to work. Signed-off-by: Fabio Utzig <utzig@apache.org>

Signed-off-by: Fabio Utzig <utzig@apache.org>

gcc create has become deprecated: https://crates.io/crates/gcc Signed-off-by: Fabio Utzig <utzig@apache.org>

Update `flash_area_*()` functions to call `sim_flash_*()` directly instead of using `hal_flash_*()` functions that were not part of the main bootloader anymore. Signed-off-by: Fabio Utzig <utzig@apache.org>

A new align() function was added to SimFlash, and most functions that were using/receiving align or erased_val parameters that had access to a Flash trait were cleaned up so that they get the parameters directly from the Flash device. This will make it easier to extend for multiple Flash devices since parameters should depend on the device in use. Signed-off-by: Fabio Utzig <utzig@apache.org>

The previous c/rust ffi functions were hardcoding the values of align and erased_val before each run through static globals. This adds new sim flash functions that get the align/erased_val from the sim flash device that is being run on, allowing that later multiple flash devices can each use its own params. Signed-off-by: Fabio Utzig <utzig@apache.org>

AreaDesc was modified to not receive a flash device on its constructor, and instead a new function `add_flash_sectors` was added that allows it to receive a flash device and id. The `add_image` function that populates the areas also now receives a dev_id that is used internally as fa_device_id. Signed-off-by: Fabio Utzig <utzig@apache.org>

A new type `FlashMap` that stores a HashMap of [device_id -> Flash trait] was added, which enables multi-flash devices to be passed around. The previously existing static FLASH value that was used to simulate the raw device, was updated to using a FlashMap which enables bootutil to interface with more than one flash device. Signed-off-by: Fabio Utzig <utzig@apache.org>

This adds an initial device with multiple flash (nrf52840 + SPI flash) and updates all test routines to use a HashMap of flash devices (added as type SimFlashMap). Signed-off-by: Fabio Utzig <utzig@apache.org>

This adds an external SPI flash that uses a larger sector size than the internal flash. Currently this breaks the tests but it's being added here to trigger a CI fail that will be fixed by adding support for this feature in a subsequent commit. Signed-off-by: Fabio Utzig <utzig@apache.org>

Signed-off-by: Fabio Utzig <utzig@apache.org>

This adds bootutil support for slots on different flash devices the happen to have different sector sizes. It consists basically in relaxing the `boot_slots_compatible` to allow swaps as long as the sectors that are required to fit both images are able to fit inside scratch and both slot's sectors have sizes that are multiple of each other. This is now tested on the simulator and was tested in a Nordic's pca10056 using slot0 in internal flash, and slot1 in the external QSPI flash, configured with 4K, 8K and 16K sized sectors (the HW is 4KB but Mynewt allows emulating multiples of that!) Signed-off-by: Fabio Utzig <utzig@apache.org>

Signed-off-by: Timo Kröger <timokroeger93@gmail.com>

Make RX buffer size configurable for UART. Allow incoming interrupts while copying data out of that buffer. Signed-off-by: Marko Kiiskila <marko@apache.org>

Signed-off-by: Marko Kiiskila <marko@apache.org>

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>

Prior to this, the update hex was deduced from the update.bin. The problem is that update.bin does not have the end padding. The end padding is required for mcuboot to upgrade a hex file flashed directly to the secondary slot. Fix this by having a separate sign command for update.hex which includes the --pad argument. This enables the user to verify the update process by flashing the update.hex file directly to the board. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

Fix the TINYCBOR build scripts to work with multi-image. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

Add button 1 as default serial detect pin for nrf9160_pca10090 Signed-off-by: Andreas Vibeto <andreas.vibeto@nordicsemi.no>

Use 'inside' and 'inherit_size'. Add KConfig-based size entries. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

Upstream changed the name of 'kernel_elf' to 'zephyr_final', in this commit we do the same renaming. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

Only build agent should be used for building jobs. Signed-off-by: Chris Bittner <chris.bittner@nordicsemi.no>

Follow the device name changes in Zephyr. Signed-off-by: Filip Kubicz <filip.kubicz@nordicsemi.no>

Use the automatically generated hex file for the app partition. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

When a parent image selects MCUboot, it should be signed regardless of whether or not mcuboot is being built from source. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

Make it easier for the user to change the mcuboot version by extracting this as a kconfig variabl. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

It is required to depend on both the wrapper target and the file. This patch adds the missing file dependency. Prior to this signed.hex (and following files) were not updated upon code change. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

This is needed when the properties are automatically set. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

NordicBuilder · 2019-06-28T15:21:22Z

Found the following issues, please fix and resubmit:

Gitlint issues

1: UC2 Body does not contain a 'Signed-Off-By' line
1: UC3 Title does not follow [subsystem]: [subject] (and should not start with literal subsys:): "MCU boot for pca20035"
1: UC6 Body has no content, should at least have 1 line.
3: B6 Body message is missing

Identity/Emails issues

83b5f59: author email (Jan Tore Guggedal jantore.guggedal@nordicsemi.no) needs to match one of the signed-off-by entries.

nvlsianpu · 2019-07-01T07:28:04Z

Please follow ncs commit message guideline. I expect something like here: 8b0e50c

mbolivar · 2019-07-01T16:00:41Z

boot/zephyr/boards/nrf52840_pca20035.conf

@@ -0,0 +1,39 @@
+# Enable RTT logging


I'm confused. The next line (CONFIG_LOG=n) isn't enabling logging; it's disabling logging.

mbolivar · 2019-07-01T16:01:53Z

boot/zephyr/CMakeLists.txt

@@ -54,6 +54,8 @@ macro(app_set_runner_args)
  endif()
 endmacro()

+include($ENV{ZEPHYR_BASE}/../nrf/cmake/boilerplate.cmake NO_POLICY_SCOPE)


Can we get a comment about why this line is needed? I'm guessing it's because it's an out of tree board definition?

CLAassistant · 2019-07-19T14:59:01Z

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 16 committers have signed the CLA.

✅ hakonfam
❌ rgundi
❌ timokroeger
❌ lemrey
❌ utzig
❌ mkiiskila
❌ d3zd3z
❌ ChristopherBittner
❌ sigvartmh
❌ nvlsianpu
❌ ccollins476ad
❌ oyvindronningstad
❌ SebastianBoe
❌ andvib
❌ Qbicz
❌ jtguggedal
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

nvlsianpu · 2019-08-22T12:19:04Z

@joakimtoe Can you rebate your changes at current master?

Synch up to: mcu-tools/mcuboot@a513b8e merged by GitHub GUI nrfconnect#44 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

utzig and others added 30 commits January 21, 2019 16:53

Fix main github repo links in docs

7bc0c4b

This updates all references from github.com/runtimeco to github.com/JuulLabs-OSS in docs and yml files. Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix typo in signed-off-by check error message

986e4c8

Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix rebase issue

c9fea47

Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix overwrite only encrypted to not use local var

7356e83

Use existing global var instead of using locally declared variable, reducing RAM usage. Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix overwrite-only encrypted images in sim

362d481

Also add overwrite-only + encrypted tests to travis-ci. Signed-off-by: Fabio Utzig <utzig@apache.org>

Add minimum size validation for header parameter

6e4ebbd

Throw exception on values that are less than the minimum acceptable size of 32 bytes. Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix image creation without sign/encryption

8eca3ef

Generating images with no signature or encryption was broken by commit 06b77b8 This allows generating images with just sha256 again, and fixes a few leftovers from the imghash TLV change. Signed-off-by: Fabio Utzig <utzig@apache.org>

Fix TLV sizes for signed images

1a33746

TLV types don't need to list KEYHASH because it's already added by any signature TLV. Total sizes were missing the KEYHASH amount. Add a new TLV for images signed with RSA and encrypted with RSA-OAEP. Signed-off-by: Fabio Utzig <utzig@apache.org>

Add build section for mbedTLS config

76dcf96

This makes it easier to choose the mbedTLS config file when multiple features share files. Signed-off-by: Fabio Utzig <utzig@apache.org>

Add TLV gen for RSA sig+enc

fb6eb3c

Signed-off-by: Fabio Utzig <utzig@apache.org>

Make sim header size slightly more configurable

854934c

This adds an HDR_SIZE constant to the simulator which allows for easier testing of images with different header sizes. Signed-off-by: Fabio Utzig <utzig@apache.org>

Add RSA sig+enc test to travis

62593bb

Signed-off-by: Fabio Utzig <utzig@apache.org>

Move from gcc to cc crate

392ed7c

gcc create has become deprecated: https://crates.io/crates/gcc Signed-off-by: Fabio Utzig <utzig@apache.org>

Remove usage of hal_flash_* functions

9929802

Update `flash_area_*()` functions to call `sim_flash_*()` directly instead of using `hal_flash_*()` functions that were not part of the main bootloader anymore. Signed-off-by: Fabio Utzig <utzig@apache.org>

Update main simulator routines for multi-flash

de76523

This adds an initial device with multiple flash (nrf52840 + SPI flash) and updates all test routines to use a HashMap of flash devices (added as type SimFlashMap). Signed-off-by: Fabio Utzig <utzig@apache.org>

Enable bootutil logging in simulator

8389090

Signed-off-by: Fabio Utzig <utzig@apache.org>

Remove unused hal includes from bootutil

ebb22ae

Signed-off-by: Timo Kröger <timokroeger93@gmail.com>

boot_uart: mynewt; option for faster speed with serial.

60439c8

Make RX buffer size configurable for UART. Allow incoming interrupts while copying data out of that buffer. Signed-off-by: Marko Kiiskila <marko@apache.org>

boot_serial; check CRC for RX only if all data has arrived.

dbaea6e

Signed-off-by: Marko Kiiskila <marko@apache.org>

Use BUILD_ASSERT_MSG instead of _Static_assert in Zephyr

874efe8

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>

Call device binding for DT_FLASH_DEV_NAME only if it is defined

6901efa

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>

hakonfam and others added 16 commits April 12, 2019 13:18

[nrf mergeup] merge upsteram up to commit aab2118

9b57d42

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

[nrf mergeup] merge upsteram up to commit 5c877d5

5e7fcb2

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

[nrf mergeup] merge upsteram up to commit 5e6f5e0

1b930a9

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

[nrf fromlist] cmake: Fix TINYCBOR in a multi-image context

a4db98d

Fix the TINYCBOR build scripts to work with multi-image. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

[nrf fromlist] boot: serial recovery: Add pca10090 default detect pin

aebd4b9

Add button 1 as default serial detect pin for nrf9160_pca10090 Signed-off-by: Andreas Vibeto <andreas.vibeto@nordicsemi.no>

[nrf noup] pm: Adapt to changes in partition manager

4b91989

Use 'inside' and 'inherit_size'. Add KConfig-based size entries. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

[nrf toup] cmake: Align with renaming kernel_elf to zephyr_final

edc8dc6

Upstream changed the name of 'kernel_elf' to 'zephyr_final', in this commit we do the same renaming. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

[nrf noup] ci: limit build agent selection

a9bdd66

Only build agent should be used for building jobs. Signed-off-by: Chris Bittner <chris.bittner@nordicsemi.no>

[nrf toup] boot: zephyr: Update USB CDC ACM device name

4ef858c

Follow the device name changes in Zephyr. Signed-off-by: Filip Kubicz <filip.kubicz@nordicsemi.no>

zephyr: cmake: Adapt to new hex file handling in Partition Manager

447495f

Use the automatically generated hex file for the app partition. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

[nrf toup] cmake: sign parent image regardless of build strategy

0a5c298

When a parent image selects MCUboot, it should be signed regardless of whether or not mcuboot is being built from source. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

[nrf toup] kconfig: add config for mcuboot version

8cb0e49

Make it easier for the user to change the mcuboot version by extracting this as a kconfig variabl. Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

[nrf noup] zephyr: cmake: Use PM properties with the proper names

8b0e50c

This is needed when the properties are automatically set. Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

MCU boot for pca20035

83b5f59

nvlsianpu self-requested a review July 1, 2019 07:21

nvlsianpu requested review from SebastianBoe, mbolivar and pdunaj and removed request for SebastianBoe July 1, 2019 07:28

mbolivar reviewed Jul 1, 2019

View reviewed changes

mbolivar force-pushed the master branch from 951bb36 to 09b7220 Compare July 18, 2019 15:05

bjda mentioned this pull request Sep 20, 2019

Add Thingy91 support #55

Merged

joakimtoe closed this Sep 30, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MCU boot for pca20035 #44

MCU boot for pca20035 #44

joakimtoe commented Jun 28, 2019

NordicBuilder commented Jun 28, 2019

nvlsianpu commented Jul 1, 2019

mbolivar Jul 1, 2019

mbolivar Jul 1, 2019

CLAassistant commented Jul 19, 2019 •

edited

Loading

nvlsianpu commented Aug 22, 2019

MCU boot for pca20035 #44

MCU boot for pca20035 #44

Conversation

joakimtoe commented Jun 28, 2019

NordicBuilder commented Jun 28, 2019

Gitlint issues

Identity/Emails issues

nvlsianpu commented Jul 1, 2019

mbolivar Jul 1, 2019

Choose a reason for hiding this comment

mbolivar Jul 1, 2019

Choose a reason for hiding this comment

CLAassistant commented Jul 19, 2019 • edited Loading

nvlsianpu commented Aug 22, 2019

CLAassistant commented Jul 19, 2019 •

edited

Loading