diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2015-11-08 17:11:53 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-18 14:50:05 -0500 |
| commit | 7b9e980e870294ab36f5b0f36abcb034a4955d29 (patch) | |
| tree | fdb327e283409f4ba748ab1feee055ad700dc03d /board | |
| parent | 310c8466cf65ade9bd33766ddc16cb886562b50b (diff) | |
| download | blackbird-obmc-uboot-7b9e980e870294ab36f5b0f36abcb034a4955d29.tar.gz blackbird-obmc-uboot-7b9e980e870294ab36f5b0f36abcb034a4955d29.zip | |
arm: mx6: cm-fx6: define fallback boot devices for spl
Use spl alternate boot device feature to define fallback to
the main boot device as it is defined by hardware.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/compulab/cm_fx6/spl.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index d94ced9c65..d8328fdadd 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -337,16 +337,17 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } -void spl_board_init(void) +void board_boot_order(u32 *spl_boot_list) { - u32 boot_device = spl_boot_device(); - - if (boot_device == BOOT_DEVICE_SPI) - puts("Booting from SPI flash\n"); - else if (boot_device == BOOT_DEVICE_MMC1) - puts("Booting from MMC\n"); - else - puts("Unknown boot device\n"); + spl_boot_list[0] = spl_boot_device(); + switch (spl_boot_list[0]) { + case BOOT_DEVICE_SPI: + spl_boot_list[1] = BOOT_DEVICE_MMC1; + break; + case BOOT_DEVICE_MMC1: + spl_boot_list[1] = BOOT_DEVICE_SPI; + break; + } } #ifdef CONFIG_SPL_MMC_SUPPORT |
