mirror of
https://github.com/u-boot/u-boot.git
synced 2025-01-23 03:03:45 +08:00
Introduced the configuration option CONFIG_USB_OHCI_NEW in order to be able
to choose between the old and the generic OHCI drivers.
This commit is contained in:
parent
53e336e9ff
commit
7b59b3c7a8
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_AUTO_UPDATE
|
#ifdef CONFIG_AUTO_UPDATE
|
||||||
|
|
||||||
#ifndef CONFIG_USB_OHCI
|
#ifndef CONFIG_USB_OHCI_NEW
|
||||||
#error "must define CONFIG_USB_OHCI"
|
#error "must define CONFIG_USB_OHCI"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
|
#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
|
||||||
# ifdef CONFIG_AT91RM9200
|
# ifdef CONFIG_AT91RM9200
|
||||||
|
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
|
#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
|
||||||
# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
|
# if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
|
||||||
|
|
||||||
#if defined(CONFIG_S3C2400)
|
#if defined(CONFIG_S3C2400)
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
|
#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
|
||||||
# ifdef CONFIG_CPU_MONAHANS
|
# ifdef CONFIG_CPU_MONAHANS
|
||||||
|
|
||||||
#include <asm/arch/pxa-regs.h>
|
#include <asm/arch/pxa-regs.h>
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
/* #include <pci.h> no PCI on the S3C24X0 */
|
/* #include <pci.h> no PCI on the S3C24X0 */
|
||||||
|
|
||||||
#ifdef CONFIG_USB_OHCI
|
#ifdef CONFIG_USB_OHCI_NEW
|
||||||
|
|
||||||
/* mk: are these really required? */
|
/* mk: are these really required? */
|
||||||
#if defined(CONFIG_S3C2400)
|
#if defined(CONFIG_S3C2400)
|
||||||
@ -1756,4 +1756,4 @@ int usb_lowlevel_stop(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_USB_OHCI */
|
#endif /* CONFIG_USB_OHCI_NEW */
|
||||||
|
@ -125,7 +125,7 @@
|
|||||||
|
|
||||||
/* USB */
|
/* USB */
|
||||||
#ifdef CONFIG_STK52XX
|
#ifdef CONFIG_STK52XX
|
||||||
#define CONFIG_USB_OHCI
|
#define CONFIG_USB_OHCI_NEW
|
||||||
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
|
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
|
||||||
#define CONFIG_USB_STORAGE
|
#define CONFIG_USB_STORAGE
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* USB */
|
/* USB */
|
||||||
#define CONFIG_USB_OHCI 1
|
#define CONFIG_USB_OHCI_NEW 1
|
||||||
#define CONFIG_USB_STORAGE 1
|
#define CONFIG_USB_STORAGE 1
|
||||||
#define CONFIG_DOS_PARTITION 1
|
#define CONFIG_DOS_PARTITION 1
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@
|
|||||||
|
|
||||||
#undef CONFIG_MODEM_SUPPORT /* disable modem initialization stuff */
|
#undef CONFIG_MODEM_SUPPORT /* disable modem initialization stuff */
|
||||||
|
|
||||||
#define CONFIG_USB_OHCI 1
|
#define CONFIG_USB_OHCI_NEW 1
|
||||||
#define CONFIG_USB_KEYBOARD 1
|
#define CONFIG_USB_KEYBOARD 1
|
||||||
#define CONFIG_USB_STORAGE 1
|
#define CONFIG_USB_STORAGE 1
|
||||||
#define CONFIG_DOS_PARTITION 1
|
#define CONFIG_DOS_PARTITION 1
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
|
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
|
||||||
|
|
||||||
/* USB stuff */
|
/* USB stuff */
|
||||||
#define CONFIG_USB_OHCI 1
|
#define CONFIG_USB_OHCI_NEW 1
|
||||||
#define CONFIG_USB_STORAGE 1
|
#define CONFIG_USB_STORAGE 1
|
||||||
#define CONFIG_DOS_PARTITION 1
|
#define CONFIG_DOS_PARTITION 1
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_440EP
|
#ifdef CONFIG_440EP
|
||||||
/* USB */
|
/* USB */
|
||||||
#define CONFIG_USB_OHCI
|
#define CONFIG_USB_OHCI_NEW
|
||||||
#define CONFIG_USB_STORAGE
|
#define CONFIG_USB_STORAGE
|
||||||
|
|
||||||
#undef CFG_USB_OHCI_BOARD_INIT
|
#undef CFG_USB_OHCI_BOARD_INIT
|
||||||
|
@ -169,7 +169,7 @@ struct usb_device {
|
|||||||
* this is how the lowlevel part communicate with the outer world
|
* this is how the lowlevel part communicate with the outer world
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS)
|
#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS) || defined(CONFIG_USB_OHCI_NEW)
|
||||||
int usb_lowlevel_init(void);
|
int usb_lowlevel_init(void);
|
||||||
int usb_lowlevel_stop(void);
|
int usb_lowlevel_stop(void);
|
||||||
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,int transfer_len);
|
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,int transfer_len);
|
||||||
|
Loading…
Reference in New Issue
Block a user