diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-08-26 19:34:41 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-09-03 12:06:24 +0200 |
| commit | 7165378d19a8a76b3182b95681af61d2bc93a74c (patch) | |
| tree | 6b73e459d13b1831c5cd10fc94453a8bff1eb869 /package/boot/uboot-imx6 | |
| parent | aa3efca8d92f3a81e90006983304ee48a1184551 (diff) | |
| download | upstream-7165378d19a8a76b3182b95681af61d2bc93a74c.tar.gz upstream-7165378d19a8a76b3182b95681af61d2bc93a74c.tar.bz2 upstream-7165378d19a8a76b3182b95681af61d2bc93a74c.zip | |
uboot-imx6: fall back to MMC for SPL if boot mode is invalid
Fixes boot on Hummingboard
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/boot/uboot-imx6')
| -rw-r--r-- | package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch new file mode 100644 index 0000000000..0883eb7b28 --- /dev/null +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -0,0 +1,26 @@ +--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c ++++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c +@@ -334,6 +334,12 @@ int board_init(void) + return ret; + } + ++void board_boot_order(u32 *spl_boot_list) ++{ ++ spl_boot_list[0] = spl_boot_device(); ++ spl_boot_list[1] = BOOT_DEVICE_MMC1; ++} ++ + static bool is_hummingboard(void) + { + int val1, val2; +--- a/arch/arm/mach-imx/spl.c ++++ b/arch/arm/mach-imx/spl.c +@@ -136,7 +136,7 @@ int g_dnl_bind_fixup(struct usb_device_d + /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ + u32 spl_boot_mode(const u32 boot_device) + { +- switch (spl_boot_device()) { ++ switch (boot_device) { + /* for MMC return either RAW or FAT mode */ + case BOOT_DEVICE_MMC1: + case BOOT_DEVICE_MMC2: |