diff options
| author | Tom Rini <trini@ti.com> | 2015-02-16 14:55:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-17 06:27:44 -0500 |
| commit | a851604ca36493e8319a7d3a17594b7224d546fe (patch) | |
| tree | dff68fbdd1b098e334d0da031de250dc8852c3b9 /common | |
| parent | 0ce3f1f90ae6168805f20e473a9ed7fab5fb13a8 (diff) | |
| parent | 840fe95c3bcff7692c51b90ebc0d350792597ff0 (diff) | |
| download | u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.zip u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.gz u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index daaeb50..ded0f30 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -229,6 +229,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_sata_load_image(); break; #endif +#ifdef CONFIG_SPL_BOARD_LOAD_IMAGE + case BOOT_DEVICE_BOARD: + spl_board_load_image(); + break; +#endif default: #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) puts("SPL: Unsupported Boot Device!\n"); |