diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2009-10-30 12:14:40 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2009-10-30 12:14:40 +0900 |
| commit | 0bf7de838096e804f0cece8f2d94905477381b6e (patch) | |
| tree | fc57495ade62aeba85b935353955a28444e5b65b /lib_mips | |
| parent | d43bc3d2d09022bcffa1302b8f51e7fabe2dc68a (diff) | |
| parent | 4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e (diff) | |
| download | u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.zip u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.gz u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/eukrea/cpu9260/cpu9260.c
drivers/serial/serial_s5pc1xx.c
include/asm-arm/arch-s5pc1xx/clock.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/pwm.h
include/asm-arm/arch-s5pc1xx/uart.h
include/configs/cpu9260.h
include/configs/cpuat91.h
include/configs/davinci_dm355evm.h
include/linux/mtd/samsung_onenand.h
Diffstat (limited to 'lib_mips')
| -rw-r--r-- | lib_mips/board.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib_mips/board.c b/lib_mips/board.c index f62a46a..b2d113e 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -33,6 +33,10 @@ #include <onenand_uboot.h> #include <spi.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif + DECLARE_GLOBAL_DATA_PTR; #if ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \ @@ -407,6 +411,9 @@ void board_init_r (gd_t *id, ulong dest_addr) misc_init_r (); #endif +#ifdef CONFIG_BITBANGMII + bb_miiphy_init(); +#endif #if defined(CONFIG_CMD_NET) #if defined(CONFIG_NET_MULTI) puts ("Net: "); |