mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge branch 'master' of git://git.denx.de/u-boot-usb
* 'master' of git://git.denx.de/u-boot-usb: MUSB driver: Timeout is never detected as the while loop does not end usb: fix ulpi_set_vbus prototype pxa25x: Add UDC registers definitions USB: Fix strict aliasing in ohci-hcd usb: Optimize USB storage read/write ehci: Optimize qTD allocations usb_stor_BBB_transport: Do not delay when not required usb_storage: Remove EHCI constraints usb_storage: Restore non-EHCI support ehci-hcd: Boost transfer speed ehci: cosmetic: Define used constants ehci: Fail for multi-transaction interrupt transfers arm:trats: Enable g_dnl composite USB gadget with embedded DFU function on TRATS arm:trats: Support for USB UDC driver at TRATS board. dfu:cmd: Support for DFU u-boot command dfu: MMC specific routines for DFU operation dfu: DFU backend implementation dfu:usb: DFU USB function (f_dfu) support for g_dnl composite gadget dfu:usb: Support for g_dnl composite download gadget. ehci: cosmetic: Define the number of qt_buffers Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
@@ -97,6 +97,21 @@
|
||||
#undef CONFIG_CMD_ONENAND
|
||||
#undef CONFIG_CMD_MTDPARTS
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_CMD_DFU
|
||||
|
||||
/* FAT */
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_FAT_WRITE
|
||||
|
||||
/* USB Composite download gadget - g_dnl */
|
||||
#define CONFIG_USBDOWNLOAD_GADGET
|
||||
#define CONFIG_DFU_FUNCTION
|
||||
#define CONFIG_DFU_MMC
|
||||
|
||||
/* USB Samsung's IDs */
|
||||
#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
|
||||
#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
|
||||
#define CONFIG_G_DNL_MANUFACTURER "Samsung"
|
||||
|
||||
#define CONFIG_BOOTDELAY 1
|
||||
#define CONFIG_ZERO_BOOTDELAY_CHECK
|
||||
@@ -107,6 +122,11 @@
|
||||
#define CONFIG_BOOTBLOCK "10"
|
||||
#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
|
||||
|
||||
#define CONFIG_DFU_ALT \
|
||||
"dfu_alt_info=" \
|
||||
"u-boot mmc 80 400;" \
|
||||
"uImage fat 0 2\0" \
|
||||
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
#define CONFIG_SYS_CONSOLE_INFO_QUIET
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
||||
@@ -150,7 +170,8 @@
|
||||
"mmcdev=0\0" \
|
||||
"mmcbootpart=2\0" \
|
||||
"mmcrootpart=3\0" \
|
||||
"opts=always_resume=1"
|
||||
"opts=always_resume=1\0" \
|
||||
CONFIG_DFU_ALT
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
@@ -210,6 +231,7 @@
|
||||
#define CONFIG_USB_GADGET
|
||||
#define CONFIG_USB_GADGET_S3C_UDC_OTG
|
||||
#define CONFIG_USB_GADGET_DUALSPEED
|
||||
#define CONFIG_USB_GADGET_VBUS_DRAW 2
|
||||
|
||||
/* LCD */
|
||||
#define CONFIG_EXYNOS_FB
|
||||
|
||||
103
include/dfu.h
Normal file
103
include/dfu.h
Normal file
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
* dfu.h - DFU flashable area description
|
||||
*
|
||||
* Copyright (C) 2012 Samsung Electronics
|
||||
* authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
|
||||
* Lukasz Majewski <l.majewski@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __DFU_ENTITY_H_
|
||||
#define __DFU_ENTITY_H_
|
||||
|
||||
#include <common.h>
|
||||
#include <linux/list.h>
|
||||
#include <mmc.h>
|
||||
|
||||
enum dfu_device_type {
|
||||
DFU_DEV_MMC = 1,
|
||||
DFU_DEV_ONENAND,
|
||||
DFU_DEV_NAND,
|
||||
};
|
||||
|
||||
enum dfu_layout {
|
||||
DFU_RAW_ADDR = 1,
|
||||
DFU_FS_FAT,
|
||||
DFU_FS_EXT2,
|
||||
DFU_FS_EXT3,
|
||||
DFU_FS_EXT4,
|
||||
};
|
||||
|
||||
struct mmc_internal_data {
|
||||
/* RAW programming */
|
||||
unsigned int lba_start;
|
||||
unsigned int lba_size;
|
||||
unsigned int lba_blk_size;
|
||||
|
||||
/* FAT/EXT */
|
||||
unsigned int dev;
|
||||
unsigned int part;
|
||||
};
|
||||
|
||||
static inline unsigned int get_mmc_blk_size(int dev)
|
||||
{
|
||||
return find_mmc_device(dev)->read_bl_len;
|
||||
}
|
||||
|
||||
#define DFU_NAME_SIZE 32
|
||||
#define DFU_CMD_BUF_SIZE 128
|
||||
#define DFU_DATA_BUF_SIZE (1024*1024*4) /* 4 MiB */
|
||||
|
||||
struct dfu_entity {
|
||||
char name[DFU_NAME_SIZE];
|
||||
int alt;
|
||||
void *dev_private;
|
||||
int dev_num;
|
||||
enum dfu_device_type dev_type;
|
||||
enum dfu_layout layout;
|
||||
|
||||
union {
|
||||
struct mmc_internal_data mmc;
|
||||
} data;
|
||||
|
||||
int (*read_medium)(struct dfu_entity *dfu, void *buf, long *len);
|
||||
int (*write_medium)(struct dfu_entity *dfu, void *buf, long *len);
|
||||
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
int dfu_config_entities(char *s, char *interface, int num);
|
||||
void dfu_free_entities(void);
|
||||
void dfu_show_entities(void);
|
||||
int dfu_get_alt_number(void);
|
||||
const char *dfu_get_dev_type(enum dfu_device_type t);
|
||||
const char *dfu_get_layout(enum dfu_layout l);
|
||||
struct dfu_entity *dfu_get_entity(int alt);
|
||||
char *dfu_extract_token(char** e, int *n);
|
||||
|
||||
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);
|
||||
/* Device specific */
|
||||
#ifdef CONFIG_DFU_MMC
|
||||
extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s);
|
||||
#else
|
||||
static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
|
||||
{
|
||||
puts("MMC support not available!\n");
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
#endif /* __DFU_ENTITY_H_ */
|
||||
33
include/g_dnl.h
Normal file
33
include/g_dnl.h
Normal file
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Samsung Electronics
|
||||
* Lukasz Majewski <l.majewski@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __G_DOWNLOAD_H_
|
||||
#define __G_DOWNLOAD_H_
|
||||
|
||||
#include <linux/usb/ch9.h>
|
||||
#include <usbdescriptors.h>
|
||||
#include <linux/usb/gadget.h>
|
||||
|
||||
int g_dnl_register(const char *s);
|
||||
void g_dnl_unregister(void);
|
||||
|
||||
/* USB initialization declaration - board specific */
|
||||
void board_usb_init(void);
|
||||
#endif /* __G_DOWNLOAD_H_ */
|
||||
@@ -61,7 +61,7 @@ int ulpi_select_transceiver(struct ulpi_viewport *ulpi_vp, unsigned speed);
|
||||
*
|
||||
* returns 0 on success, ULPI_ERROR on failure.
|
||||
*/
|
||||
int ulpi_enable_vbus(struct ulpi_viewport *ulpi_vp,
|
||||
int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp,
|
||||
int on, int ext_power, int ext_ind);
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user