| Message ID | 1441425831-3441-8-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Sep 04, 2015 at 10:03:49PM -0600, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > CONFIG_SYS_DFU_DATA_BUF_SIZE defines the size of chunks transferred > across USB. This doesn't need to be particularly large, since it doesn't > limit the overall transfer size. > > CONFIG_SYS_DFU_MAX_FILE_SIZE is used to buffer an entire file before > writing it to a filesystem. This define limits the maximum file size that > may be transferred. Bump this up to 32MiB in order to support large > uncompressed kernel images. > > Both of these buffers are dynamically allocated, and so the size of both > needs to be taken into account when calculating the required malloc > region size. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 594fa456d17f..651c4c493536 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -12,8 +12,9 @@ * Size of malloc() pool */ #ifdef CONFIG_USB_FUNCTION_DFU -#define CONFIG_SYS_MALLOC_LEN ((4 << 20) + \ - CONFIG_SYS_DFU_DATA_BUF_SIZE) +#define CONFIG_SYS_MALLOC_LEN (SZ_4M + \ + CONFIG_SYS_DFU_DATA_BUF_SIZE + \ + CONFIG_SYS_DFU_MAX_FILE_SIZE) #else #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ #endif diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index e51da3f40571..b1a14cbe73b5 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -30,7 +30,8 @@ #define CONFIG_CMD_USB_MASS_STORAGE /* DFU protocol */ #define CONFIG_USB_FUNCTION_DFU -#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024) +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_32M #define CONFIG_CMD_DFU #ifdef CONFIG_MMC #define CONFIG_DFU_MMC