diff options
| author | Tom Rini <trini@ti.com> | 2013-07-03 08:40:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-03 08:40:58 -0400 |
| commit | 36f05e60f9cedbb4cb5c57211a6ddb85b1a82cb7 (patch) | |
| tree | 9d4489de1ebcacc2ab9cdaebe62cad1b2b44c2fa /include | |
| parent | 2cb0e55a3cd737be1d228a9f90b3d34fab0d0d46 (diff) | |
| parent | befd387242143ba0f7e298cfef6baf26c4260ec0 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/dfu.h | 4 | ||||
| -rw-r--r-- | include/g_dnl.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/composite.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/dfu.h b/include/dfu.h index a107f4b13e..124653c816 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -68,7 +68,9 @@ static inline unsigned int get_mmc_blk_size(int dev) #define DFU_NAME_SIZE 32 #define DFU_CMD_BUF_SIZE 128 -#define DFU_DATA_BUF_SIZE (1024*1024*8) /* 8 MiB */ +#ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024*1024*8) /* 8 MiB */ +#endif #ifndef CONFIG_SYS_DFU_MAX_FILE_SIZE #define CONFIG_SYS_DFU_MAX_FILE_SIZE (4 << 20) /* 4 MiB */ #endif diff --git a/include/g_dnl.h b/include/g_dnl.h index f47395f35d..f8affd8d91 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -23,7 +23,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> - +int g_dnl_bind_fixup(struct usb_device_descriptor *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 53cb095507..4f76f88d67 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -331,7 +331,7 @@ struct usb_composite_dev { /* private: */ /* internals */ unsigned int suspended:1; - struct usb_device_descriptor desc; + struct usb_device_descriptor __aligned(CONFIG_SYS_CACHELINE_SIZE) desc; struct list_head configs; struct usb_composite_driver *driver; u8 next_string_id; |