diff options
| author | mattis fjallstrom <mattis@acm.org> | 2014-10-15 03:40:52 +0200 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2014-10-15 03:40:52 +0200 |
| commit | 95a5724b19c0c1281a7f72ad1812079a53a52dbc (patch) | |
| tree | 100f5fe1d385b5cd012cc1f4db0bf6aa46ffc30c /common/spl/spl.c | |
| parent | a252a3577da19fb129333c4adc07fd473d10f289 (diff) | |
| download | olio-uboot-2014.01-95a5724b19c0c1281a7f72ad1812079a53a52dbc.tar.xz olio-uboot-2014.01-95a5724b19c0c1281a7f72ad1812079a53a52dbc.zip | |
Adding memtest and build-time flag for SPL serial boot
Change-Id: Iaf14e63498c3cdca4e2125b8217195b90caf842b
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 2c7ca16dc..c294b1ef4 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -129,6 +129,7 @@ static void spl_ram_load_image(void) } #endif + void board_init_r(gd_t *dummy1, ulong dummy2) { u32 boot_device; @@ -151,7 +152,17 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_board_init(); #endif + /* If we want to boot from UART, for OMAP3630, we hardcode boot_device + * to BOOT_DEVICE_UART. Same thing in + * arch/arm/cpu/armv7/omap3/board.c. --mfj + */ + +#ifdef SPL_BOOT_DEVICE_UART + boot_device = BOOT_DEVICE_UART; /* spl_boot_device(); */ +#else boot_device = spl_boot_device(); +#endif /* SPL_BOOT_DEVICE_UART */ + debug("boot device - %d\n", boot_device); switch (boot_device) { #ifdef CONFIG_SPL_RAM_DEVICE @@ -210,7 +221,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif #ifdef CONFIG_SPL_USBETH_SUPPORT case BOOT_DEVICE_USBETH: - debug("Booting from USB ETHER\"); + debug("Booting from USB ETHER\n"); spl_net_load_image("usb_ether"); break; #endif |