diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
| commit | f04c53762962280365005c9db12ab561a18f2692 (patch) | |
| tree | 6cd2fa04929473afda1cceaa297cd340792bd326 /board/freescale/mx35pdk | |
| parent | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (diff) | |
| parent | ce7a7f5e6bda35d7d0972be07b6983552d1a2cb2 (diff) | |
| download | u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.zip u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.tar.gz u-boot-imx-f04c53762962280365005c9db12ab561a18f2692.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/freescale/mx35pdk')
| -rw-r--r-- | board/freescale/mx35pdk/mx35pdk.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c index 427c83a..9fabef5 100644 --- a/board/freescale/mx35pdk/mx35pdk.c +++ b/board/freescale/mx35pdk/mx35pdk.c @@ -251,14 +251,12 @@ int board_late_init(void) int board_eth_init(bd_t *bis) { - int rc = -ENODEV; #if defined(CONFIG_SMC911X) - rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + int rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + if (rc) + return rc; #endif - - cpu_eth_init(bis); - - return rc; + return cpu_eth_init(bis); } #if defined(CONFIG_FSL_ESDHC) |