Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
@@ -481,7 +481,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MMC
|
||||
#define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
|
||||
#define CONFIG_FSL_ESDHC_ADAPTER_IDENT
|
||||
#endif
|
||||
|
||||
@@ -630,7 +630,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
* SDHC
|
||||
*/
|
||||
#ifdef CONFIG_MMC
|
||||
#define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
|
||||
#define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
|
||||
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
|
||||
|
||||
Reference in New Issue
Block a user