diff mbox

[U-Boot,v3,1/8] board: ti: ks2_evm: remove board_eth_init when CONFIG_DM_ETH is defined

Message ID 1454408498-23374-2-git-send-email-mugunthanvnm@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Mugunthan V N Feb. 2, 2016, 10:21 a.m. UTC 
remove board_eth_init when CONFIG_DM_ETH is defined

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---
 board/ti/ks2_evm/board.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Tom Rini Feb. 8, 2016, 8:48 p.m. UTC | #1 
On Tue, Feb 02, 2016 at 03:51:31PM +0530, Mugunthan V N wrote:

> remove board_eth_init when CONFIG_DM_ETH is defined
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 73d94a6..7d1709c 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -56,6 +56,7 @@  int board_init(void)
 }
 
 #ifdef CONFIG_DRIVER_TI_KEYSTONE_NET
+#ifndef CONFIG_DM_ETH
 int get_eth_env_param(char *env_name)
 {
 	char *env;
@@ -105,6 +106,7 @@  int board_eth_init(bd_t *bis)
 	return 0;
 }
 #endif
+#endif
 
 #ifdef CONFIG_SPL_BUILD
 void spl_board_init(void)