diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-10 08:01:11 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-10 08:01:11 -0600 |
| commit | 09bd690cc38a7e7a04fbfff9e76dee35297dc1c7 (patch) | |
| tree | 857e756bc4f0b85575db3247e2e2d2009e1007b8 /cmd/fastboot.c | |
| parent | 8a2cf6307a2ccc09c39dde486b6d9375b78c82c2 (diff) | |
| parent | df50c821e75957113b93e45b363cb22c965e7a9b (diff) | |
Merge tag 'u-boot-dfu-20250410' of https://source.denx.de/u-boot/custodians/u-boot-dfu
u-boot-dfu-20250410
CI:
- https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/25615
Usb gadget:
- Add SAM9X60 support to atmel driver
- Fix memory leaks in f_mass_storage gadget driver
- Fix comment typo in dwc3 gadget driver
Fastboot:
- Lift restrictions on !NET_LWIP for USB
Android:
- Fix possible NULL ptr when AVB is out of memory
Diffstat (limited to 'cmd/fastboot.c')
| -rw-r--r-- | cmd/fastboot.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/fastboot.c b/cmd/fastboot.c index d4cfc0c7a28..be84a482b81 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -16,6 +16,7 @@ #include <linux/printk.h> #include <linux/stringify.h> +#if CONFIG_IS_ENABLED(NET) static int do_fastboot_udp(int argc, char *const argv[], uintptr_t buf_addr, size_t buf_size) { @@ -55,6 +56,7 @@ static int do_fastboot_tcp(int argc, char *const argv[], return CMD_RET_SUCCESS; } +#endif static int do_fastboot_usb(int argc, char *const argv[], uintptr_t buf_addr, size_t buf_size) @@ -160,10 +162,12 @@ NXTARG: fastboot_init((void *)buf_addr, buf_size); +#if CONFIG_IS_ENABLED(NET) if (!strcmp(argv[1], "udp")) return do_fastboot_udp(argc, argv, buf_addr, buf_size); if (!strcmp(argv[1], "tcp")) return do_fastboot_tcp(argc, argv, buf_addr, buf_size); +#endif if (!strcmp(argv[1], "usb")) { argv++; argc--; |