diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-05 21:05:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-05 21:05:51 -0400 |
| commit | b9eaeae19eb93993e18149f119fa360b13c5643f (patch) | |
| tree | 1a06fbe252e23c1a93dae72ba4eb5aec09808f67 /drivers | |
| parent | ad701b1c911f733a5083c784644b1b67c9d12b3a (diff) | |
| parent | 2cb7b900f42ad796b8dc50afe8379bbda64e80e9 (diff) | |
| download | u-boot-b9eaeae19eb93993e18149f119fa360b13c5643f.zip u-boot-b9eaeae19eb93993e18149f119fa360b13c5643f.tar.gz u-boot-b9eaeae19eb93993e18149f119fa360b13c5643f.tar.bz2 | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dfu/dfu_sf.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 9702eee..b6d5fe2 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -20,7 +20,8 @@ static long dfu_get_medium_size_sf(struct dfu_entity *dfu) static int dfu_read_medium_sf(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { - return spi_flash_read(dfu->data.sf.dev, offset, *len, buf); + return spi_flash_read(dfu->data.sf.dev, dfu->data.sf.start + offset, + *len, buf); } static u64 find_sector(struct dfu_entity *dfu, u64 start, u64 offset) diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index f20fc33..dceba4b 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -10,6 +10,7 @@ #include <errno.h> #include <pci.h> #include <usb.h> +#include <asm/io.h> #include "ehci.h" |