diff options
| author | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
| commit | 41341221d12341a2ecfb280142d6478071738fc2 (patch) | |
| tree | 850a87b274b572b65a579474a0aad5e590ca6d61 /board/ti/am335x/board.c | |
| parent | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (diff) | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
| download | u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.zip u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.gz u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR
Conflicts:
arch/arm/include/asm/arch-omap5/omap.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/ti/am335x/board.c')
| -rw-r--r-- | board/ti/am335x/board.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 73bf853..638cc4d 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -514,6 +514,7 @@ int board_eth_init(bd_t *bis) eth_setenv_enetaddr("ethaddr", mac_addr); } +#ifdef CONFIG_DRIVER_TI_CPSW if (board_is_bone() || board_is_bone_lt() || board_is_idk()) { writel(MII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = @@ -529,6 +530,7 @@ int board_eth_init(bd_t *bis) printf("Error %d registering CPSW switch\n", rv); else n += rv; +#endif /* * |