Unverified Commit 6e1a577b authored by Kumar Gala's avatar Kumar Gala Committed by GitHub
Browse files

Merge branch 'mcu-tools:main' into main

parents 9c737361 3942e9bf

boot/boot_serial/src/boot_serial.c

+2 −0
Original line number Diff line number Diff line
@@ -849,7 +849,9 @@ boot_serial_read_console(const struct boot_uart_funcs *f,int timeout_in_ms) 


    off = 0;

    while (timeout_in_ms > 0 || bs_entry) {

#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU

        MCUBOOT_CPU_IDLE();

#endif

        MCUBOOT_WATCHDOG_FEED();

#ifdef MCUBOOT_SERIAL_WAIT_FOR_DFU

        uint32_t start = k_uptime_get_32();

boot/zephyr/boards/nrf52840_big.overlay

+0 −1
Original line number Diff line number Diff line
@@ -32,6 +32,5 @@ 
&zephyr_udc0 {

	cdc_acm_uart0 {

		compatible = "zephyr,cdc-acm-uart";

		label = "CDC_ACM_0";

	};

};

boot/zephyr/usb_cdc_acm.overlay

+0 −1
Original line number Diff line number Diff line 
&zephyr_udc0 {

	cdc_acm_uart0 {

		compatible = "zephyr,cdc-acm-uart";

		label = "CDC_ACM_0";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE