[U-Boot] [PULL] u-boot-usb/master
The following changes since commit 2b26201a2aef0b310b7c04702b0dba5dea493f77:
env_nand.c: support falling back to redundant env when writing (2013-08-22 17:49:47 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to c95e2b9eaeadc0f985030ffa0638278acc2d8727:
console: usb: kbd: To fix slow TFTP booting (2013-08-26 21:56:35 +0200)
---------------------------------------------------------------- Dan Murphy (7): omap5: uevm: Change the board name to correct name ARM: OMAP5: USB: Add OMAP5 common USB EHCI information ARM: OMAP: USB: Fix linker error when ULPI is not defined ARM: OMAP5-uevm: Add USB ehci support for the uEVM ARM: OMAP5-uevm: Add USB MAC ethernet address USB: usb-hub: Add a weak function for resetting devices ARM: OMAP5-uevm: Add usb device reset API
Fabio Estevam (2): usb: ehci-mx5: Remove unneeded write to cscmr1 register usb: ehci-mx5: Use 'bool' instead of 'unsigned char'
Heiko Schocher (1): dfu, nand, ubi: add partubi alt settings for updating ubi partition
Jim Lin (3): NET: Add net_busy_flag if CONFIG_USB_KEYBOARD is defined console: usb: kbd: To improve TFTP booting performance console: usb: kbd: To fix slow TFTP booting
Julius Werner (1): usb: Use well-known descriptor sizes when parsing configuration
Lukasz Majewski (2): usb:dfu:g_dnl: Change number of exported configurations at composite gadget usb:dfu:g_dnl: Refactoring the string definition code for g_dnl driver
arch/arm/cpu/armv7/mx5/clock.c | 10 +++++----- arch/arm/include/asm/arch-mx5/clock.h | 6 +++--- arch/arm/include/asm/arch-omap5/clock.h | 17 +++++++++++++++++ arch/arm/include/asm/arch-omap5/ehci.h | 43 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/ehci-omap.h | 2 ++ board/ti/omap5_uevm/evm.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- board/ti/omap5_uevm/mux_data.h | 4 +++- common/usb.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- common/usb_hub.c | 26 ++++++++++++++++---------- common/usb_kbd.c | 15 +++++++++++++++ drivers/dfu/dfu_nand.c | 38 ++++++++++++++++++++++++++++++++++++-- drivers/usb/gadget/g_dnl.c | 17 +++++++++++------ drivers/usb/host/ehci-mx5.c | 15 +++------------ drivers/usb/host/ehci-omap.c | 33 +++++++++++++++++++++++++++++++-- include/configs/omap5_uevm.h | 24 ++++++++++++++++++++++++ include/dfu.h | 2 ++ net/net.c | 11 +++++++++++ 17 files changed, 388 insertions(+), 58 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap5/ehci.h
With the new include structure for TI platforms, we need to not define our own CONFIG_SYS_PROMPT and also need to include <configs/omap5_common.h> much sooner, so do both of these. Also drop the unused CONFIG_NET_MULTI
Signed-off-by: Tom Rini trini@ti.com --- include/configs/omap5_uevm.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 0bba84b..3c4249b 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -17,6 +17,8 @@ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
+#include <configs/omap5_common.h> + #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_BAUDRATE 115200 @@ -53,7 +55,6 @@ #define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
/* Enabled commands */ -#define CONFIG_NET_MULTI #define CONFIG_CMD_DHCP /* DHCP Support */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ @@ -62,11 +63,7 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX
-#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # " - #define CONSOLEDEV "ttyO2" #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296
-#include <configs/omap5_common.h> - #endif /* __CONFIG_OMAP5_EVM_H */
On Tue, Aug 27, 2013 at 10:57:39AM -0400, Tom Rini wrote:
With the new include structure for TI platforms, we need to not define our own CONFIG_SYS_PROMPT and also need to include <configs/omap5_common.h> much sooner, so do both of these. Also drop the unused CONFIG_NET_MULTI
Signed-off-by: Tom Rini trini@ti.com
Applied to u-boot/master.
On Tue, Aug 27, 2013 at 03:43:57PM +0200, Marek Vasut wrote:
The following changes since commit 2b26201a2aef0b310b7c04702b0dba5dea493f77:
env_nand.c: support falling back to redundant env when writing (2013-08-22 17:49:47 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to c95e2b9eaeadc0f985030ffa0638278acc2d8727:
console: usb: kbd: To fix slow TFTP booting (2013-08-26 21:56:35 +0200)
Dan Murphy (7): omap5: uevm: Change the board name to correct name ARM: OMAP5: USB: Add OMAP5 common USB EHCI information ARM: OMAP: USB: Fix linker error when ULPI is not defined ARM: OMAP5-uevm: Add USB ehci support for the uEVM ARM: OMAP5-uevm: Add USB MAC ethernet address USB: usb-hub: Add a weak function for resetting devices ARM: OMAP5-uevm: Add usb device reset API
Fabio Estevam (2): usb: ehci-mx5: Remove unneeded write to cscmr1 register usb: ehci-mx5: Use 'bool' instead of 'unsigned char'
Heiko Schocher (1): dfu, nand, ubi: add partubi alt settings for updating ubi partition
Jim Lin (3): NET: Add net_busy_flag if CONFIG_USB_KEYBOARD is defined console: usb: kbd: To improve TFTP booting performance console: usb: kbd: To fix slow TFTP booting
Julius Werner (1): usb: Use well-known descriptor sizes when parsing configuration
Lukasz Majewski (2): usb:dfu:g_dnl: Change number of exported configurations at composite gadget usb:dfu:g_dnl: Refactoring the string definition code for g_dnl driver
arch/arm/cpu/armv7/mx5/clock.c | 10 +++++----- arch/arm/include/asm/arch-mx5/clock.h | 6 +++--- arch/arm/include/asm/arch-omap5/clock.h | 17 +++++++++++++++++ arch/arm/include/asm/arch-omap5/ehci.h | 43 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/ehci-omap.h | 2 ++ board/ti/omap5_uevm/evm.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- board/ti/omap5_uevm/mux_data.h | 4 +++- common/usb.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- common/usb_hub.c | 26 ++++++++++++++++---------- common/usb_kbd.c | 15 +++++++++++++++ drivers/dfu/dfu_nand.c | 38 ++++++++++++++++++++++++++++++++++++-- drivers/usb/gadget/g_dnl.c | 17 +++++++++++------ drivers/usb/host/ehci-mx5.c | 15 +++------------ drivers/usb/host/ehci-omap.c | 33 +++++++++++++++++++++++++++++++-- include/configs/omap5_uevm.h | 24 ++++++++++++++++++++++++ include/dfu.h | 2 ++ net/net.c | 11 +++++++++++ 17 files changed, 388 insertions(+), 58 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap5/ehci.h
Applied to u-boot/master, thanks!
participants (2)
-
Marek Vasut -
Tom Rini