…LER_LABEL

As upstream zephyr is phasing out DT_FLASH defines for non-partition
usage replace DT_FLASH_DEV_NAME with
DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL.

Signed-off-by: Kumar Gala <[email protected]>

As the DT define DT_JEDEC_SPI_NOR_0_LABEL is intended to be deprecated
move to the new macro style to determine for DT_JEDEC_SPI_NOR_0_LABEL

Signed-off-by: Kumar Gala <[email protected]>

This reverts commit 8cd5dc5.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

…cros""

This reverts commit 39d1aef.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronize up to

mcu-tools/mcuboot@82c5f7
which is same as v1.6.0-rc2 tag.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

As we replace the legacy DT_FLASH_ support use the new FLASH_AREA_
macros.

Signed-off-by: Kumar Gala <[email protected]>

Use the new FLASH_AREA_ macros.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Fixup how we fake out devicetree.h, which is now really the flash map
API for what mcuboot is using.

Signed-off-by: Kumar Gala <[email protected]>

Signed-off-by: Kumar Gala <[email protected]>

Update CONFIG_FLOAT to CONFIG_FPU which has been renamed in zephyr.

Signed-off-by: Joakim Andersson <[email protected]>

Using find_package to locate Zephyr.

Old behavior was to use $ENV{ZEPHYR_BASE} for inclusion of boiler plate
code.

Whenever an automatic run of CMake happend by the build system / IDE
then it was required that ZEPHYR_BASE was defined.
Using ZEPHYR_BASE only to locate the Zephyr package allows CMake to
cache the base variable and thus allowing subsequent invocation even
if ZEPHYR_BASE is not set in the environment.

It also removes the risk of strange build results if a user switchs
between different Zephyr based project folders and forgetting to reset
ZEPHYR_BASE before running ninja / make.

Signed-off-by: Torsten Rasmussen <[email protected]>

Convert to use C99 types as we intend to deprecate the zephyr
specific integer types.

Signed-off-by: Kumar Gala <[email protected]>

This reverts commit b7254d1.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronize up to:
mcu-tools/mcuboot@9b48d08

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronize up to:
mcu-tools/mcuboot@33fbef5

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Align the code to the new UART callback signature, see:

zephyrproject-rtos/zephyr#26426

Signed-off-by: Carles Cufi <[email protected]>

Synchronize up to:
mcu-tools/mcuboot@1cb076c

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronize up to:
mcu-tools/mcuboot@5a6e181

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Change whitelist->allow to be compatible with sanitycheck in zephyr.

Signed-off-by: Anas Nashif <[email protected]>

Fix author email after move to new mailing list.

Signed-off-by: Fabio Utzig <[email protected]>

Follows up the change added to Zephyr with:

zephyrproject-rtos/zephyr#24873

Signed-off-by: Fabio Utzig <[email protected]>

Change fixes build issue that occurs if CONF_FILE contains multiple
file paths instead of single file path.

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>

Missing const on pointers to device structures caused compilation
warnings when compiling bootloader with serial recovery enabled.

Signed-off-by: Dominik Ermel <[email protected]>

Synchronized up to:
https://github.com/JuulLabs-OSS/mcuboot/commit/@296949e

Improvements:
- hardening against hardware level fault injection and timing attacks
- Abstract crypto primitives to simplify porting.
- boot: Add ram-load upgrade mode
- renamed single-image mode to single-slot mode

- kconfig: provide logic for setting key file, simplify prj.conf

- imgtool: Print image digest during verify
- imgtool: Add possibility to set confirm flag for hex files as well
- imgtool: --confirm implies --pad

- Added single-slot Zephyr-RTOS test build

fixes:
- bootutil: fix boostrapping in swap-move
- bootutil: fix swap-move brick with padded image_0
- Disable HW stack protection (temporary hack)
- reset SPLIM registers before boot
- fixes build issue that occurs if CONF_FILE contains multiple file paths instead of single file path.
- imgtool: Fix 'custom_tlvs' argument handling
- Turn off cache for Cortex M7 before chain-loading.- hardening against hardware level fault injection and timing attacks

Conflicts:
- took upsteram boot/zephyr/sample.yaml

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@c625da4

- Removed the `flash_area_read_is_empty()` port implementation function
- Added watchdog feed on nRF dvices. See CONFIG BOOT_WATCHDOG_FEED option.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@c74c551

- corected bugfix #830 of upgrade issue in swap-move
- changed default for CONFIG_MCUBOOT_CLEANUP_ARM_CODE to n, added MPU register clean-up to this option
- bootutil: ecdsa: Fixed CC310 for nRF devices
- zephyr: made flash_area_erased_val() weak
- serial recovery: allow unaligned last image data chunk

Signed-off-by: Andrzej Puzdrowski <[email protected]>

merged by GitHub GUI nrfconnect#38

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@d2122bc

- Added 'revert' support to direct-xip mode.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

merged by GitHub GUI nrfconnect#39 

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Merge in upstream MCUboot revision e512181

- allow xip-revert only for xip-mode
- boot: Fix LOAD_IMAGE_DATA macro
- bootutil: crypto: avoid unuseful memset
- ext: tinycrypt: update ctr mode to stream
- zephyr: use minimal CBPRINTF implementation
- zephyr/Kconfig: Added default pin for serial recovery mode for nRF5340DK
- boot: zephyr: Default to LOG_MINIMAL
- imgtool: Add support for setting fixed ROM address into image header
- boot: zephyr: cleanup NXP MPU configuration before boot
- fix nokogiri<=1.11.0.rc4 vulnerability

The remaining commits are related to MCUboot CI and tests.

merged by GitHub GUI nrfconnect#41

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@be64e6a

- extracted bootutil_public library

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@be64e6a

merged by GitHub GUI nrfconnect#42

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@ce50334

- ci: relax signed-off-by checks on forks

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@ce50334

merged by GitHub GUI nrfconnect#43

Signed-off-by: Andrzej Puzdrowski <[email protected]>

    Synchronized up to:
    mcu-tools/mcuboot@a513b8e

    - fix build issue caused by that CONFIG_LOG_MINIMAL was replaced by CONFIG_LOG_MODE_MINIMAL
    - imgtool: fix validation with protected TLVs

    Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@a513b8e

merged by GitHub GUI nrfconnect#44

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@360763d

- fixed corupted build when the image encryption feature is enabled.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
zephyrproject-rtos/mcuboot@360763d

merged by GitHub GUI nrfconnect#45

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@5b7ed6a
- Added LED support for signaling enter to the serial recovery mode
- Added boot delay/debonuce of serial detect pin.
- Fixed compilation warnings with ZEPHYR_LOG_MODE_MINIMAL
- Added optional check which prevents attempting to boot image that
has been build for different ROM address than a slot it currently
resides in. Check is enabled if image was signed with IMAGE_F_ROM_FIXED flag.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@5b7ed6a

merged by GitHub GUI nrfconnect#46

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to:
mcu-tools/mcuboot@de51807

- add an option to use GPIO to enable USB DFU.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@de51807

merged by GitHub GUI nrfconnect#47

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@e20e092

merged by GitHub GUI nrfconnect#48

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@22b856b

- bootutil_public: allow to confirm padded image without copy-done flag
- boot: zephyr: Configure mimxrt106x_evk boards

Merged by GH GUI

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@9b97456eb2

- boot_serial: allow to build when CONFIG_MULTITHREADING=n
- allow to not provide scratch area definition if scratch algorithm is not used.

Merged by GH GUI

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to:
mcu-tools/mcuboot@680ed07

* Added AES256 support for image encryption
* zephyr: serial: Remove unnecessary call to irq_unlock 
* boot_serial: Port encoding to use cddl-gen
* bootutil_public: Make boot_read_swap_state declaration public
* zephyr: allow to build nRF52840 targets in zephyr-rtos CI

Merged by GH GUI

Signed-off-by: Andrzej Puzdrowski <[email protected]>

The platforms that are listed as integration platforms in
the Zephyr boot sample need to be included in the platform
allow list, otherwise zephyr CI will throw an error. This
commit removes the common list of integration platforms and
adds integration platform entries in each test variant, in
accordance with the allow-list in each of the variants.

Signed-off-by: Ioannis Glaropoulos <[email protected]>

USB device support configuration is revised,
CONFIG_USB option is deprecated.
Only USB_DEVICE_STACK option should be used to
enable USB device support.

Signed-off-by: Johann Fischer <[email protected]>

Adapt to Zephyr OS changes to get CDC ACM UART device.
Remove RECOVERY_UART_DEV_NAME Kconfig option and
use DEVICE_DT_GET() in serial_adapter.c

Signed-off-by: Johann Fischer <[email protected]>

Move CDC ACM UART node from common DTC overlay to
specific overlays, nrf52840_big.overlays and
usb_cdc_acm.overlays.

Signed-off-by: Johann Fischer <[email protected]>

synch up to upstream:
mcu-tools/mcuboot@85da97f

- introduce MCUBOOT_CPU_IDLE() for support low power single thread
- Allow not working secondary image device and boot form primary device if image available

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Change fixes memory alignment of the RAM buffer that is used to
temporarily store data during swap. Some FLASH drivers require
word-aligned input data buffer. Using unaligned buffer results
in FLASH write error.

Signed-off-by: Marek Pieta <[email protected]>
(cherry picked from commit e51ec07)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

The previous definition did not work as setting any type of flag would
make IS_ENCRYPTED true.

Signed-off-by: Salome Thirot <[email protected]>
(cherry picked from commit 2386267)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

This PR updates the path to the devicetree python package lib files according to the Zephyr PR
zephyrproject-rtos#33746 which moved the devicetree lib files.

Old path: ZEPHYR_BASE/scripts/dts/
New path: ZEPHYR_BASE/scripts/dts/python-devicetree/src/devicetree/

Signed-off-by: Carl-Johan Landin <[email protected]>
(cherry picked from commit f44fd61)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

Fix structure member assignment in tstrx_put() tstrx_put_term()
macro.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit fc1ad8d)

Upstream Zephyr has renamed the 'nonsecure' variants for boards that
support TF-M. The rename consistently uses '_ns' or '_NS' (with
underscore) as the postfix which distinguishes these variants from
their 'secure' versions.

This affects Kconfig symbols used by MCUboot, so fix them to keep
working with the latest zephyr main branch.

Signed-off-by: Martí Bolívar <[email protected]>
(cherry picked from commit 994816d)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

LOG_IMMEDIATE Kconfig option has been repurposed and is now a Zephyr's
internal, non-visible symbol that should not be used by the end user.

The logging mode used by MCUBoot is defined in prj.conf

Signed-off-by: Piotr Mienkowski <[email protected]>
(cherry picked from commit 01c8442)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

To bring in bugfixes.
Regenerate code.

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit 1e63e8f)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

Also, keep casts to make build pass.

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit 6693067)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

`irq_lock()` sets `BASEPRI_MAX` aka. the `BASEPRI` mask to whatever
zephyr has configured it to be by the value of `_EXC_IRQ_DEFAULT_PRIO`.

However by calling arm_cleanup() we also do the call to
`__disable_irq()` setting the PRIMASK to 1. Meaning the only exceptions
we can recive is fault exceptions. Masking out more exceptions does not
really make sense.

Sometimes applications booted by MCUBoot will not expect the `BASEPRI`
to be set to something else than 0(No effect). Meaning if they depend on
using some exception which now is masked out by `BASEPRI` they will
fail.

Signed-off-by: Sigvart Hovland <[email protected]>
(cherry picked from commit e933e58)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

Change fixes encoding data length and adds support for big endian
byte ordering. According to specification, data length can be
encoded either on 1, 2, 4 or 8 bytes.

Signed-off-by: Marek Pieta <[email protected]>
(cherry picked from commit 4960d12)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

So in PR #1089 I misaligned the `#else` used for the `irq_lock` as it
should be aligned with `CONFIG_MCUBOOT_CLEANUP_ARM_CORE`. So that
`irq_lock`is called when we don't call `__disable_irq` from arm core
clean up code.

Signed-off-by: Sigvart Hovland <[email protected]>
(cherry picked from commit 9647c46)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

If user generate project and the will try to switch signature type
then it is very likely that MBETLS will be enabled simultaneously when
tinycrypt has to be force-selected, which causes kconfig warning on
impossible configuration. Such configuration won't be possible to be
fixed using menuconfig etc.

This patch moves dependency check on !MBEDTLS from kconfig to preprocessor
which makes manual fixing using menuconfig possible.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit 5cf9410)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

…LTS 2.7.0

Synchronized up using merge as far as possible to not lost compatibility with TFM:
up to mcu-tools/mcuboot@85da97f

- introduce MCUBOOT_CPU_IDLE() for support low power single thread (fixes single thread power consumption)
- Allow not working secondary image device and boot form primary device if image available

Other fixes were cherry-picked:
- fixes memory alignment of the RAM buffer that is used to temporarily store data during swap.
- update devicetree py package lib files include path in assembly
- serial recovery: cbor_encoder: fix str encoding macros
- zephyr: Kconfig: fix board references
- do not set defaults for LOG_IMMEDIATE Kconfig
- boot: Do not use `irq_lock()` if using arm cleanup
- Kconfig: fix deadlock on cryptolib selectors

merged by Github web GUI

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Update version fields for 1.8.0-rc2 release.

Signed-off-by: David Brown <[email protected]>

This brings MCUboot up to the upstream v1.8.0-rc2 release.

Signed-off-by: David Brown <[email protected]>

Zephyr to mcuboot 1.8

Synchronized up to upstream:
mcu-tools/mcuboot@1a9c6d8

Signed-off-by: Andrzej Puzdrowski <[email protected]>

- based on mcuboot 1.8.0

- documentation tweaks
- bootutil: Fixed boot_read_image_header() error path when flash_area is unavilable
- bootutil: Fixed boot_find_status() leaving flash area open
- bootutil: Fixed possible uninitialized flash_area access in boot_write_status()
- Fixed support for single application with serial recovery

merge using GH web GUI

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Merged by GH web UI, PR nrfconnect#66

synchronization up to mcu-tools/mcuboot@05143ce

- Fixed serial recovery skipping on nrf5340
- Fixed issue which caused that progressive's erase feature was off although
was selected by Kconfig (introduced by #42c985cead)
- Added check of reset address in incoming image validation phase, see `CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS`
- Allow image header bigger than 1 KB for encrypted images
- Fixed build with image encryption using RSA (issue introduced by migration to mbedTLS 3.0.0)
- stm32: watchdog support
- many documentation improvements

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synch up to upstream:
mcu-tools/mcuboot@1eedec3

- fixed the build issue caused by removal of CONFIG_SYSTEM_CLOCK_DISABLE property (within zephyrproject-rtos/zephyr#37435)
- always call sys_clock_disable() in main since the empty sys_clock_disable() callback is provided if the platform doesn't support system clock disable capability.
- bootutil: Close flash_area after failure to read swap status information
- fixed status offset calculation in case of scratch area
- fixed include path for reboot.h header.

Merged using GitHub web gui

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Use MCUboot logging macros instead of zephyr-rtos native.
This fixes build failure on MCUBOOT_LOG_MODULE_DECLARE() when
LOG is disabled.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit d16598f)

As part of zephyrproject-rtos/zephyr#42457,
Zephyr recently changed its CRC APIs. The commit below
adapted the use of mcumgr in-tree, but MCUboot was missing the change:
zephyrproject-rtos/zephyr@07c78e5

Note that although on other platforms the function called is
crc_ccitt(), the CRC16 actually used by MCUboot/mcumgr is:
https://reveng.sourceforge.io/crc-catalogue/16.htm#crc.cat.crc-16-xmodem

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit b9192a4)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

bugfixes for zephyr-rtos 3.0.0-rc2

Synchronization  7th March 2022

merge using GH web GUI

Synch up to upstream mcu-tools/mcuboot@aa041a2

- Added workflow verifying integration with the Zephyr
- removed deprecated DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL
- Fixed usage of CONFIG_LOG_IMMEDIATE 

Signed-off-by: Marek Pieta <[email protected]>

Change disables CONFIG_USB_DEVICE_REMOTE_WAKEUP, because it is not
supported by the MCUboot bootloader source code.

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>

This option was reserved for serial recovery mode, while
it should be available for USB DFU as well.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

This fixes a build issue when building mcuboot for zephyr with image
encryption support enabled using tinycrypt.

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>

The Cache is an optional configuration of both the ARM Cortex-M7 and
Cortex-M55. Previously, it was just checking that it was just an M7
rather than knowing that the CPU actually was built with the cache.

Signed-off-by: Ryan McClelland <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>

This fixes a build issue when building mcuboot for zephyr with RSA
image encryption support enabled using mbedtls.

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>

…0-rc2

cherry-pick fixes for zephyr 3.1.0-rc2

…gion

Entry point call was moved back from main to esp_loader, so it is
called from iram_loader_seg memory region

Signed-off-by: Almir Okato <[email protected]>
(cherry picked from commit c4b3058)
Signed-off-by: Andrzej Puzdrowski <[email protected]>

cherry-pick fix for zephyr 3.1.0-rc3

This reverts commit 30889ae.

This prepares clean synchronization by merging mcu-tools/mcuboot

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized with:
mcu-tools/mcuboot@1270880

- boot_serial: refactoring and optimalization (mainly afects progresive erase implementation)
- migrate includes to <zephyr/...>
- switched DFU detection GPIO-pin configuration to be done through DTS.
  That pin is assigned thanks to `mcuboot-button0` pin-alias.
- boot_serial: Fix echo command code no longer compiling
- Added MCUboot status callback support, see `CONFIG_MCUBOOT_ACTION_HOOKS` Kconfig option.
- reworked LED usage, prefer DTS mcuboot-led0 alias over bootloader-led0 alias
- Added initial support for leverage RAM-LOAD mode with the zephyr-rtos port
- boot_serial: Upgrade from cddl-gen 0.1.0 to zcbor 0.4.0

- imgtool: Added support for providing the signature by 3rd party

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Merged
zephyrproject-rtos/mcuboot#80
using GH web GUI.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to the:
mcu-tools/mcuboot@3175182

Merged nrfconnect#83 using GH web GUI.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Synchronized up to the:
mcu-tools/mcuboot@8eadf8c

Merged nrfconnect#84 using GH web GUI.

Signed-off-by: Andrzej Puzdrowski <[email protected]>