boot: zephyr: Refactor USB DFU entry logic #2277
Conversation
|
The tests are failing with the following logs: What shall I do to make it clone? |
FIH hardening tests can be ignored, these are failing due to a problem with the TFM git server |
boot/zephyr/main.c
Outdated
| #if defined(CONFIG_BOOT_USB_DFU_WAIT) | ||
| mcuboot_status_change(MCUBOOT_STATUS_USB_DFU_WAITING); | ||
| wait_for_usb_dfu(K_MSEC(CONFIG_BOOT_USB_DFU_WAIT_DELAY_MS)); | ||
| BOOT_LOG_INF("USB DFU wait time elapsed"); | ||
| mcuboot_status_change(MCUBOOT_STATUS_USB_DFU_TIMED_OUT); | ||
| #else | ||
| wait_for_usb_dfu(K_FOREVER); | ||
| BOOT_LOG_INF("USB DFU wait terminated"); | ||
| #endif | ||
| } |
There was a problem hiding this comment.
Something is odd with this block.
There was a problem hiding this comment.
Are you talking about alignment? Let me check.
There was a problem hiding this comment.
Changed. Please check now.
sayooj-aerlync
force-pushed
the
usb.dfu.optimization
branch
from
54b47cb to
8000f2f
Compare
boot/zephyr/main.c
Outdated
|
|
||
| mcuboot_status_change(MCUBOOT_STATUS_USB_DFU_TIMED_OUT); | ||
| } | ||
| } |
There was a problem hiding this comment.
This one is still not ok.
boot/zephyr/main.c
Outdated
| #ifdef CONFIG_MCUBOOT_INDICATION_LED | ||
| io_led_set(1); | ||
| #endif | ||
|
|
||
| mcuboot_status_change(MCUBOOT_STATUS_USB_DFU_ENTERED); | ||
| } | ||
| #elif defined(CONFIG_BOOT_USB_DFU_WAIT) | ||
| usb_dfu_requested = true; |
There was a problem hiding this comment.
This one is also incorrectly indented. Are you using tabs or spaces?
There was a problem hiding this comment.
I used tabs initially on vim, that is leading to issues. Spaces are aligning correctly.
Consolidates USB DFU entry logic by unifying GPIO and timeout-based DFU triggers under a common flag. This avoids code duplication and improves maintainability. Also improves log clarity for different DFU exit conditions. Signed-off-by: Sayooj K Karun <[email protected]>
sayooj-aerlync
force-pushed
the
usb.dfu.optimization
branch
from
8000f2f to
a77c554
Compare
|
Please have a look into this @de-nordic @nordicjm |
Consolidates USB DFU entry logic by unifying GPIO and timeout-based DFU triggers under a common flag. This avoids code duplication and improves maintainability.
Also improves log clarity for different DFU exit conditions.