diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-01-23 22:25:39 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2019-01-26 21:46:32 +0100 |
| commit | c2bdd018a301662258ec745bf4da71d6d6193af1 (patch) | |
| tree | efb4e7696df8ecffad5e6e50f1c2dc0c40dbd110 /package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch | |
| parent | 66a4978b4355e3e8f860a87ca14c0f293931d038 (diff) | |
| download | upstream-c2bdd018a301662258ec745bf4da71d6d6193af1.tar.gz upstream-c2bdd018a301662258ec745bf4da71d6d6193af1.tar.bz2 upstream-c2bdd018a301662258ec745bf4da71d6d6193af1.zip | |
uboot-imx6: Bump to 2019.01
Build tested: apalis, mx6sabresd, nitrogen6dl, nitrogen6dl2g, nitrogen6q,
nitrogen6q2g, nitrogen6s, nitrogen6s1g, wandboard
Run tested: apalis (pending PR #1595)
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Vladimir Vid <vladimir.vid@sartura.hr>
Cc: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch')
| -rw-r--r-- | package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch | 10 |
1 files changed, 5 insertions, 5 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 index 0883eb7b28..4b34a831ba 100644 --- a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -1,7 +1,7 @@ --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -334,6 +334,12 @@ int board_init(void) - return ret; +@@ -290,6 +290,12 @@ static void setup_iomux_enet(void) + udelay(100); } +void board_boot_order(u32 *spl_boot_list) @@ -10,12 +10,12 @@ + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} + - static bool is_hummingboard(void) + int board_phy_config(struct phy_device *phydev) { - int val1, val2; + if (phydev->drv->config) --- 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 +@@ -167,7 +167,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) { |