redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
utp
Nikita Kiryanov 2015-11-08 17:11:53 +02:00 committed by Tom Rini
parent 310c8466cf
commit 7b9e980e87
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
board/compulab/cm_fx6/spl.c
View File

@ -337,16 +337,17 @@ void board_init_f(ulong dummy)
board_init_r(NULL, 0); board_init_r(NULL, 0);
} }
void spl_board_init(void) void board_boot_order(u32 *spl_boot_list)
{ {
u32 boot_device = spl_boot_device(); spl_boot_list[0] = spl_boot_device();
switch (spl_boot_list[0]) {
if (boot_device == BOOT_DEVICE_SPI) case BOOT_DEVICE_SPI:
puts("Booting from SPI flash\n"); spl_boot_list[1] = BOOT_DEVICE_MMC1;
else if (boot_device == BOOT_DEVICE_MMC1) break;
puts("Booting from MMC\n"); case BOOT_DEVICE_MMC1:
else spl_boot_list[1] = BOOT_DEVICE_SPI;
puts("Unknown boot device\n"); break;
}
} }
#ifdef CONFIG_SPL_MMC_SUPPORT #ifdef CONFIG_SPL_MMC_SUPPORT

1
include/configs/cm_fx6.h
View File

@ -230,7 +230,6 @@
/* SPL */ /* SPL */
#include "imx6_spl.h" #include "imx6_spl.h"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 /* offset 64 kb */ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 /* offset 64 kb */
#define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024) #define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024)