Unverified Commit 21e56a1b authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski Committed by GitHub
Browse files

Synch with upstream 02a3edd2 

Sync with upstream:
https://github.com/mcu-tools/mcuboot/commit/02a3edd24f2fb993de4e87831e8e09611536969b



Merged using GH web GUI
Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 6e1a577b 02a3edd2

boot/boot_serial/src/boot_serial.c

+5 −0
Original line number Diff line number Diff line
@@ -849,6 +849,11 @@ boot_serial_read_console(const struct boot_uart_funcs *f,int timeout_in_ms) 


    off = 0;

    while (timeout_in_ms > 0 || bs_entry) {

        /*

         * Don't enter CPU idle state here if timeout based serial recovery is

         * used as otherwise the boot process hangs forever, waiting for input

         * from serial console (if single-thread mode is used).

         */

#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU

        MCUBOOT_CPU_IDLE();

#endif

boot/zephyr/boards/nrf52840dk_ram.overlay

+0 −3
Original line number Diff line number Diff line
@@ -31,12 +31,9 @@ 
			#size-cells = <1>;

			erase-value = <0xff>;



			label = "flash_ctrl";



			flash_sim0: flash_sim@0 {

				status = "okay";

				compatible = "soc-nv-flash";

				label = "simulated_flash";

				erase-block-size = <4096>;

				write-block-size = <1>;

				reg = <0x00000000 DT_SIZE_K(40)>;

boot/zephyr/boards/nrf52840dk_ram_multi.overlay

+0 −3
Original line number Diff line number Diff line
@@ -39,12 +39,9 @@ 
			#size-cells = <1>;

			erase-value = <0xff>;



			label = "flash_ctrl";



			flash_sim0: flash_sim@0 {

				status = "okay";

				compatible = "soc-nv-flash";

				label = "simulated_flash";

				erase-block-size = <4096>;

				write-block-size = <1>;

				reg = <0x00000000 DT_SIZE_K(40)>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE