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_blackfin | |
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_blackfin')
-rw-r--r-- | lib_blackfin/board.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 1053f69..3670d2c 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -26,6 +26,10 @@ #include <nand.h> /* cannot even include nand.h if it isnt configured */ #endif +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif + #if defined(CONFIG_POST) #include <post.h> int post_flag; @@ -270,6 +274,9 @@ void board_init_f(ulong bootflag) static void board_net_init_r(bd_t *bd) { +#ifdef CONFIG_BITBANGMII + bb_miiphy_init(); +#endif #ifdef CONFIG_CMD_NET uchar enetaddr[6]; char *s; |