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

Synch to mcu-tool/mcuboot 2fa1190f 

Synchronized up to:
https://github.com/mcu-tools/mcuboot/commit/2fa1190ff36ff8cbaf8eb76cad68386d3c668b66



- zephyr: fixed typo in watchdog support
- serial recovery: fixed build failure if CONFIG_BOOT_SERIAL_DETECT_PIN
has undefined value 

Merged using GH web GUI

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents fec7042d 2fa1190f

boot/zephyr/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ config BOOT_USB_DFU_DETECT_PIN 
	default 13 if BOARD_NRF52DK_NRF52832

	default 23 if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPP_NS

	default 43 if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS

	default -1

	help

	  Pin on the DFU detect port that triggers DFU mode.

boot/zephyr/Kconfig.serial_recovery

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ config BOOT_SERIAL_DETECT_PIN 
	default 13 if BOARD_NRF52DK_NRF52832 || BOARD_NRF52833DK_NRF52833

	default 23 if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPP_NS || \

		BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS

	default -1

	help

	  Pin on the serial detect port that triggers serial recovery mode.

boot/zephyr/boards/disco_l475_iot1.conf

+1 −1
Original line number Diff line number Diff line 
CONFIG_BOOT_MAX_IMG_SECTORS=256

CONFIG_WATCHDOG=y

boot/zephyr/boards/frdm_k64f.conf

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_WATCHDOG=y

boot/zephyr/include/mcuboot_config/mcuboot_config.h

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ 
        const struct device* wdt =                                  \

            DEVICE_DT_GET_OR_NULL(DT_INST(0, st_stm32_watchdog));   \

        if (device_is_ready(wdt)) {                                 \

            wdt_feed(wtd, 0);                                       \

            wdt_feed(wdt, 0);                                       \

        }                                                           \

    } while (0)
@@ -289,7 +289,7 @@ 
        const struct device* wdt =                            \

            DEVICE_DT_GET(DT_ALIAS(watchdog0));               \

        if (device_is_ready(wdt)) {                           \

                wdt_feed(wtd, 0);                             \

            wdt_feed(wdt, 0);                                 \

        }                                                     \

    } while (0)

#else /* DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE