Merge git://git.denx.de/u-boot-usb
This commit is contained in:
@@ -107,17 +107,6 @@
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
||||
/*
|
||||
* USB
|
||||
*/
|
||||
/* EHCI Support - disbaled by default */
|
||||
/*#define CONFIG_HAS_FSL_DR_USB*/
|
||||
|
||||
#ifdef CONFIG_HAS_FSL_DR_USB
|
||||
#define CONFIG_USB_EHCI_FSL
|
||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||
#endif
|
||||
|
||||
/* MMC */
|
||||
#ifdef CONFIG_MMC
|
||||
#define CONFIG_FSL_ESDHC
|
||||
|
||||
@@ -393,17 +393,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* USB
|
||||
*/
|
||||
/* EHCI Support - disbaled by default */
|
||||
/*#define CONFIG_HAS_FSL_DR_USB*/
|
||||
|
||||
#ifdef CONFIG_HAS_FSL_DR_USB
|
||||
#define CONFIG_USB_EHCI_FSL
|
||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Video
|
||||
*/
|
||||
|
||||
@@ -24,26 +24,6 @@
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
|
||||
|
||||
/*
|
||||
* USB
|
||||
*/
|
||||
|
||||
/*
|
||||
* EHCI Support - disbaled by default as
|
||||
* there is no signal coming out of soc on
|
||||
* this board for this controller. However,
|
||||
* the silicon still has this controller,
|
||||
* and anyone can use this controller by
|
||||
* taking signals out on their board.
|
||||
*/
|
||||
|
||||
/*#define CONFIG_HAS_FSL_DR_USB*/
|
||||
|
||||
#ifdef CONFIG_HAS_FSL_DR_USB
|
||||
#define CONFIG_USB_EHCI_FSL
|
||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_CLK_FREQ 100000000
|
||||
#define CONFIG_DDR_CLK_FREQ 100000000
|
||||
|
||||
|
||||
Reference in New Issue
Block a user