diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 4 | ||||
| -rw-r--r-- | cmd/dfu.c | 3 | ||||
| -rw-r--r-- | cmd/fpga.c | 6 | ||||
| -rw-r--r-- | cmd/usb_mass_storage.c | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 3619a20e643..15ee4af4566 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -111,13 +111,13 @@ static efi_status_t copy_fdt(void **fdtp) new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 + fdt_size, 0); ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, - EFI_RUNTIME_SERVICES_DATA, fdt_pages, + EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { /* If we can't put it there, put it somewhere */ new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size); ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, - EFI_RUNTIME_SERVICES_DATA, fdt_pages, + EFI_BOOT_SERVICES_DATA, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { printf("ERROR: Failed to reserve space for FDT\n"); diff --git a/cmd/dfu.c b/cmd/dfu.c index c9ba0621970..91a750a4fca 100644 --- a/cmd/dfu.c +++ b/cmd/dfu.c @@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_DFU_OVER_USB char *usb_controller = argv[1]; #endif +#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP) char *interface = argv[2]; char *devstring = argv[3]; +#endif int ret = 0; #ifdef CONFIG_DFU_OVER_TFTP @@ -63,6 +65,7 @@ done: U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, "Device Firmware Upgrade", + "" #ifdef CONFIG_DFU_OVER_USB "<USB_controller> <interface> <dev> [list]\n" " - device firmware upgrade via <USB_controller>\n" diff --git a/cmd/fpga.c b/cmd/fpga.c index 88a8e3f3186..b1f224bc6ad 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -343,9 +343,9 @@ static int do_fpga_loadmk(cmd_tbl_t *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } - /* get fpga subimage data address and length */ - if (fit_image_get_data(fit_hdr, noffset, &fit_data, - &data_size)) { + /* get fpga subimage/external data address and length */ + if (fit_image_get_data_and_size(fit_hdr, noffset, + &fit_data, &data_size)) { puts("Fpga subimage data not found\n"); return CMD_RET_FAILURE; } diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index 753ae4f42a7..570cf3aa508 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -14,6 +14,7 @@ #include <part.h> #include <usb.h> #include <usb_mass_storage.h> +#include <watchdog.h> static int ums_read_sector(struct ums *ums_dev, ulong start, lbaint_t blkcnt, void *buf) @@ -226,6 +227,8 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, rc = CMD_RET_SUCCESS; goto cleanup_register; } + + WATCHDOG_RESET(); } cleanup_register: |