summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-03-28 08:19:05 -0400
committerTom Rini <trini@ti.com>2014-03-28 08:19:05 -0400
commit81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b (patch)
tree8056a38abdc01d0246116816cfdc50a55a16a7c2 /include
parent659c89da8e48d44395120aeb2dd0d02d3fb24b67 (diff)
parent7d0b605abb1f2dbccf4abb502f3b1fc9f97f2552 (diff)
downloadu-boot-imx-81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b.zip
u-boot-imx-81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b.tar.gz
u-boot-imx-81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
-rw-r--r--include/configs/siemens-am33x-common.h1
-rw-r--r--include/dfu.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 98b6e72..721c4e6 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -265,6 +265,7 @@
#define CONFIG_DFU_NAND
#define CONFIG_CMD_DFU
#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
+#define DFU_MANIFEST_POLL_TIMEOUT 25000
#endif /* CONFIG_SPL_BUILD */
diff --git a/include/dfu.h b/include/dfu.h
index f973426..6c71ecb 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -80,6 +80,9 @@ static inline unsigned int get_mmc_blk_size(int dev)
#ifndef DFU_DEFAULT_POLL_TIMEOUT
#define DFU_DEFAULT_POLL_TIMEOUT 0
#endif
+#ifndef DFU_MANIFEST_POLL_TIMEOUT
+#define DFU_MANIFEST_POLL_TIMEOUT DFU_DEFAULT_POLL_TIMEOUT
+#endif
struct dfu_entity {
char name[DFU_NAME_SIZE];
@@ -138,6 +141,7 @@ 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);
+int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
/* Device specific */
#ifdef CONFIG_DFU_MMC
extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s);