diff options
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index c640f874040..0d829c0f129 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(); @@ -222,7 +233,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) void preloader_console_init(void) { gd->bd = &bdata; - gd->flags |= GD_FLG_RELOC; gd->baudrate = CONFIG_BAUDRATE; serial_init(); /* serial communications setup */ |