Unverified Commit 2fce9769 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski Committed by GitHub
Browse files

Merge: synchronized up to https://github.com/mcu-tools/mcuboot/commit/9b97456 

Synch up to:
https://github.com/mcu-tools/mcuboot/commit/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: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 3ad36f82 9b97456e

.github/workflows/imgtool.yaml

+1 −1
Original line number Diff line number Diff line 
on:

  push:

    branches:

      - master

      - main

      - v*-branch



name: imgtool

.github/workflows/mynewt.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
on:

  push:

    branches:

      - master

      - main

  pull_request:



name: Mynewt

.github/workflows/sim.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
on:

  push:

    branches:

      - master

      - main

  pull_request:



name: Sim

README.md

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
[![Build Status (Sim)](https://github.com/mcu-tools/mcuboot/workflows/Sim/badge.svg)][sim]

[![Build Status (Mynewt)](https://github.com/mcu-tools/mcuboot/workflows/Mynewt/badge.svg)][mynewt]

[![Publishing Status (imgtool)](https://github.com/mcu-tools/mcuboot/workflows/imgtool/badge.svg)][imgtool]

[![Build Status (Travis CI)](https://img.shields.io/travis/mcu-tools/mcuboot/master.svg?label=travis-ci)][travis]

[![Build Status (Travis CI)](https://img.shields.io/travis/mcu-tools/mcuboot/main.svg?label=travis-ci)][travis]

[![Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)][license]



[pypi]: https://pypi.org/project/imgtool/
@@ -14,7 +14,7 @@ 
[mynewt]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:Mynewt

[imgtool]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:imgtool

[travis]: https://travis-ci.org/mcu-tools/mcuboot

[license]: https://github.com/mcu-tools/mcuboot/blob/master/LICENSE

[license]: https://github.com/mcu-tools/mcuboot/blob/main/LICENSE



This is mcuboot version 1.8.0-dev

boot/boot_serial/src/boot_serial.c

+4 −0
Original line number Diff line number Diff line
@@ -436,7 +436,11 @@ bs_reset(char *buf, int len) 
    bs_empty_rsp(buf, len);



#ifdef __ZEPHYR__

#ifdef CONFIG_MULTITHREADING

    k_sleep(K_MSEC(250));

#else

    k_busy_wait(250000);

#endif

    sys_reboot(SYS_REBOOT_COLD);

#else

    os_cputime_delay_usecs(250000);

CRA Git | Maintained and supported by SUSTech CRA and CCSE