diff options
| author | Tom Rini <trini@ti.com> | 2012-10-04 10:00:42 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-04 10:00:42 -0700 |
| commit | 198166877768cf4d0197289a524df8a6ca0e2f19 (patch) | |
| tree | d8fb2afc6d5b09ceeb4e3e62dc20b64d167ab346 /common/spl/spl.c | |
| parent | 73c15c634dda388e21eaf0ebc85e324872df0d25 (diff) | |
| parent | 777544085d2b417a36df50eb564bf037a044e60e (diff) | |
| download | olio-uboot-2014.01-198166877768cf4d0197289a524df8a6ca0e2f19.tar.xz olio-uboot-2014.01-198166877768cf4d0197289a524df8a6ca0e2f19.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index c640f8740..40a7acaea 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -155,6 +155,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2) CONFIG_SYS_SPL_MALLOC_SIZE); #endif + timer_init(); + #ifdef CONFIG_SPL_BOARD_INIT spl_board_init(); #endif @@ -194,6 +196,15 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_spi_load_image(); break; #endif +#ifdef CONFIG_SPL_ETH_SUPPORT + case BOOT_DEVICE_CPGMAC: +#ifdef CONFIG_SPL_ETH_DEVICE + spl_net_load_image(CONFIG_SPL_ETH_DEVICE); +#else + spl_net_load_image(NULL); +#endif + break; +#endif default: debug("SPL: Un-supported Boot Device\n"); hang(); |