diff options
| author | Tom Rini <[email protected]> | 2024-10-03 16:09:30 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-03 16:09:40 -0600 |
| commit | 00292c6b39b3f7dcb34e8c3ae6ef276ac862a146 (patch) | |
| tree | 0aac05f77ce8ee043acb0391680d33b0f356c92b /include | |
| parent | 0d28900dd171d3444ea16d9cc18af35a90c03e27 (diff) | |
| parent | c74758ccc091402b558b9aa7eaf1c50171d2f49f (diff) | |
Merge tag 'u-boot-dfu-next-20241003' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next
u-boot-dfu-next-20241003
CI: https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/22516
DFU:
- Reinitialize only if dfu_alt_info changed
USB Gadget:
- New usb gadget driver for Renesas USBHS
- Simplify kconfig deps for CMD_USB_MASS_STORAGE
Android:
- Provide bootloader version to android via kernel commandline
Diffstat (limited to 'include')
| -rw-r--r-- | include/dfu.h | 1 | ||||
| -rw-r--r-- | include/env_callback.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/dfu.h b/include/dfu.h index 6c5431b3948..e25588c33cb 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -517,6 +517,7 @@ static inline int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, #endif extern bool dfu_reinit_needed; +extern bool dfu_alt_info_changed; #if CONFIG_IS_ENABLED(DFU_WRITE_ALT) /** diff --git a/include/env_callback.h b/include/env_callback.h index 8e500aaaf80..66cc8309e71 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -69,6 +69,12 @@ #define BOOTSTD_CALLBACK #endif +#ifdef CONFIG_DFU +#define DFU_CALLBACK "dfu_alt_info:dfu_alt_info," +#else +#define DFU_CALLBACK +#endif + /* * This list of callback bindings is static, but may be overridden by defining * a new association in the ".callbacks" environment variable. @@ -79,6 +85,7 @@ NET_CALLBACKS \ NET6_CALLBACKS \ BOOTSTD_CALLBACK \ + DFU_CALLBACK \ "loadaddr:loadaddr," \ SILENT_CALLBACK \ "stdin:console,stdout:console,stderr:console," \ |