USB custodian repostiory updates
Dear List,
The following USB related updates have been pushed to the u-boot-usb custodian repository git://denx.de/git/u-boot-usb.git
Merge of u-boot-testing-USB:
----------------------------
I merged the former testing-USB branch, which mainly contains the generic ohci driver updates. This is an approach to get rid of the various almost identical ohci drivers by adding cpu and/or board dependant hooks. These are described in doc/README.generic_usb_ohci .
The following boards have been adapted and tested to use the generic driver so far:
[mk at pollux u-boot-usb-master]$ grep "CONFIG_USB_OHCI_NEW"
include/configs/delta.h:#define CONFIG_USB_OHCI_NEW 1
include/configs/IceCube.h:#define CONFIG_USB_OHCI_NEW
include/configs/mp2usb.h:#define CONFIG_USB_OHCI_NEW 1
include/configs/TQM5200.h:#define CONFIG_USB_OHCI_NEW
include/configs/trab.h:#define CONFIG_USB_OHCI_NEW 1
include/configs/yosemite.h:#define CONFIG_USB_OHCI_NEW
This should not break any boards that still use board specific ohci drivers, although it would be nice if they could be adapted over time. Usually this is trivial. All new boards should definitely use the generic driver.
I would like to kindly ask everybody affected by these changes to test this code. If no problems are reported, I'll request these changes to be merged to mainline in about 4 weeks.
The testing-USB branch is now pretty much obsolete, USB patches should be sent against the custodian repository.
Patches:
--------
The following patches have been merged:
The following changes since commit ae79f60677c208326535647dcbd5c3ec40dbcb0b:
Markus Klotzbuecher (1):
USB: remove the S3C24X0_merge #define, which was introduced while merging OHCI drivers.
are found in the git repository at:
git://denx.de/git/u-boot-usb.git
Markus Klotzbuecher (1):
USB: cleanup monahans usb support. Remove dead code.
Rodolfo Giometti (2):
PXA: pxa27x USB OHCI support
Support for the Philips ISP116x HCD (Host Controller Driver)
README | 1 + cpu/pxa/usb.c | 27 +- drivers/Makefile | 2 +- drivers/isp116x-hcd.c | 1412 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/isp116x.h | 489 +++++++++++++++++ include/usb.h | 5 +- 6 files changed, 1921 insertions(+), 15 deletions(-) create mode 100644 drivers/isp116x-hcd.c create mode 100644 drivers/isp116x.h
Best regards
Markus Klotzbuecher
--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
Dear Wolfgang,
Quoted 23 lines · One month ago I
The following USB related updates have been pushed to the u-boot-usb custodian repository
git://denx.de/git/u-boot-usb.gitMerge of u-boot-testing-USB:
----------------------------I merged the former testing-USB branch, which mainly contains the generic ohci driver updates. This is an approach to get rid of the various almost identical ohci drivers by adding cpu and/or board dependant hooks. These are described in doc/README.generic_usb_ohci .
The following boards have been adapted and tested to use the generic driver so far:
[mk at pollux u-boot-usb-master]$ grep "
CONFIG_USB_OHCI_NEW"include/configs/delta.h:#define
CONFIG_USB_OHCI_NEW1
include/configs/IceCube.h:#defineCONFIG_USB_OHCI_NEW
include/configs/mp2usb.h:#defineCONFIG_USB_OHCI_NEW1
include/configs/TQM5200.h:#defineCONFIG_USB_OHCI_NEW
include/configs/trab.h:#defineCONFIG_USB_OHCI_NEW1
include/configs/yosemite.h:#defineCONFIG_USB_OHCI_NEW
Quoted 8 lines
This should not break any boards that still use board specific ohci drivers, although it would be nice if they could be adapted over time. Usually this is trivial. All new boards should definitely use the generic driver.
I would like to kindly ask everybody affected by these changes to test this code. If no problems are reported, I'll request these changes to be merged to mainline in about 4 weeks.
No problems reported, great!
Quoted 25 lines
The testing-USB branch is now pretty much obsolete, USB patches should be sent against the custodian repository.
Patches:
--------The following patches have been merged:
The following changes since commit
ae79f60677c208326535647dcbd5c3ec40dbcb0b:
Markus Klotzbuecher (1):
USB: remove theS3C24X0_merge#define, which was introduced while merging OHCI drivers.are found in the git repository at:
git://denx.de/git/u-boot-usb.gitMarkus Klotzbuecher (1):
USB: cleanup monahans usb support. Remove dead code.Rodolfo Giometti (2):
PXA: pxa27x USB OHCI support
Support for the Philips ISP116x HCD (Host Controller Driver)
Quoted 9 lines
README | 1 + cpu/pxa/usb.c | 27 +- drivers/Makefile | 2 +- drivers/isp116x-hcd.c | 1412 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/isp116x.h | 489 +++++++++++++++++ include/usb.h | 5 +- 6 files changed, 1921 insertions(+), 15 deletions(-) create mode 100644 drivers/isp116x-hcd.c create mode 100644 drivers/isp116x.h
Please pull from the "master" branch at git://denx.de/git/u-boot-usb.git
Best Regards
Markus Klotzb?cher
--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
Dear Markus,
Quoted 2 lines · in message <[email protected]> you wrote:
Please pull from the "master" branch at
git://denx.de/git/u-boot-usb.git
Sorry, but you have unresolved merge problems in your tree: I noticed it in the CHANGELOG file:
4048 <<<<<<< master
4049 * Code cleanup
4050
4051 * Various USB related patches
4052 - Add support for mpc8xx USB device. 4053 - Add support for Common Device Class - Abstract Control Model USB console. 4054 - Add support for flow control in USB slave devices. 4055 - Add support for switching between gserial and cdc_acm using environment. 4056 - Minor changes to usbdcore_omap1510.c usbdcore_omap1510.h 4057 - Update usbcore slightly to ease host enumeration. 4058 - Fix non-portable endian problems in usbdcore and usbdcore_ep0. 4059 - Add AdderUSB_config as a defconfig to enable usage of the USB console
4060 by default with the Adder87x U-Boot port.
4061 Patch by Bryan O'Donoghue <[email protected]>, 29 May
2006
4062
4063 * Cleanup trab board for GCC-4.x
4064 =======
4065 commit 8078f1a5f63a739b8533478f6c2b62fb1e2f79d7 4066 Author: Wolfgang Denk <[email protected]>
4067 Date: Sat Oct 28 02:28:02 2006 +0200
4068 >>>>>>> trunk
but you might want to check all other files as well.
Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, CEO: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de To the systems programmer, users and applications serve only to provide a test load.
Dear Wolfgang,
Quoted 6 lines · Wolfgang Denk
Quoted 2 lines · in message <[email protected]> you wrote:
Please pull from the "master" branch at
git://denx.de/git/u-boot-usb.gitSorry, but you have unresolved merge problems in your tree: I noticed it in the CHANGELOG file:
This seems to have been inherited from old testing-usb branch:
I've moved the old Changelog entry to CHANGELOG-before-U-Boot-1.1.5.
Quoted 1 line
but you might want to check all other files as well.
I can't see any other. Please try again.
Best regards
Markus Klotzb?cher
--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
[U-Boot-Users] please PULL u-boot-usb.git
In reply to Wolfgang DenkDear Wolfgang,
Quoted 6 lines · Wolfgang Denk
Quoted 2 lines · in message <[email protected]> you wrote:
Please pull from the "master" branch at
git://denx.de/git/u-boot-usb.gitSorry, but you have unresolved merge problems in your tree: I noticed it in the CHANGELOG file:
I've cleaned this up, and failed to find any other conflicts. Please try again.
Best regards
Markus
--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany