diff options
| author | Tom Rini <[email protected]> | 2020-09-03 09:48:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-09-03 09:48:28 -0400 |
| commit | 9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426 (patch) | |
| tree | 50aa5bfd07887062e0d6808158a02434c9a85116 /common | |
| parent | 7f4d3c044504668fcbc547af52e0c2c4fd715d27 (diff) | |
| parent | 293a6dfeb96129abebf1ad927fa9aedf03a66d34 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Mostly DFU fixes and r8152 fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_sdp.c | 2 | ||||
| -rw-r--r-- | common/update.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index e7f7b684116..ae9c09883a4 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -19,6 +19,8 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, usb_gadget_initialize(controller_index); + board_usb_init(0, USB_INIT_DEVICE); + g_dnl_clear_detach(); ret = g_dnl_register("usb_dnl_sdp"); if (ret) { diff --git a/common/update.c b/common/update.c index c8dd346a095..36b6b7523d5 100644 --- a/common/update.c +++ b/common/update.c @@ -24,6 +24,7 @@ #include <net.h> #include <net/tftp.h> #include <malloc.h> +#include <mapmem.h> #include <dfu.h> #include <errno.h> #include <mtd/cfi_flash.h> @@ -280,7 +281,7 @@ int update_tftp(ulong addr, char *interface, char *devstring) } got_update_file: - fit = (void *)addr; + fit = map_sysmem(addr, 0); if (!fit_check_format((void *)fit)) { printf("Bad FIT format of the update file, aborting " @@ -309,8 +310,7 @@ got_update_file: printf("\n"); if (update_fit_getparams(fit, noffset, &update_addr, &update_fladdr, &update_size)) { - printf("Error: can't get update parameteres, " - "aborting\n"); + printf("Error: can't get update parameters, aborting\n"); ret = 1; goto next_node; } |