diff options
| author | Tom Rini <trini@ti.com> | 2013-12-18 15:06:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-18 15:06:43 -0500 |
| commit | 2d65256bb0ea105eb11e30c1beb6da121b719f06 (patch) | |
| tree | d3c16ff19eb900017d4c7df201df11f8e31f2372 /include | |
| parent | 57270260adc6076facd284107be463f9beebb153 (diff) | |
| parent | eb63218b9b95a59baa8b241f3a88e4415dabf833 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/trats.h | 1 | ||||
| -rw-r--r-- | include/dfu.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h index 08771422ec..6cd15c25bd 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -99,6 +99,7 @@ #define CONFIG_THOR_FUNCTION #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC diff --git a/include/dfu.h b/include/dfu.h index cc14044927..f973426aa9 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -77,6 +77,9 @@ static inline unsigned int get_mmc_blk_size(int dev) #ifndef CONFIG_SYS_DFU_MAX_FILE_SIZE #define CONFIG_SYS_DFU_MAX_FILE_SIZE CONFIG_SYS_DFU_DATA_BUF_SIZE #endif +#ifndef DFU_DEFAULT_POLL_TIMEOUT +#define DFU_DEFAULT_POLL_TIMEOUT 0 +#endif struct dfu_entity { char name[DFU_NAME_SIZE]; @@ -131,6 +134,7 @@ bool dfu_reset(void); int dfu_init_env_entities(char *interface, int dev); unsigned char *dfu_get_buf(void); unsigned char *dfu_free_buf(void); +unsigned long dfu_get_buf_size(void); int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num); int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); |