diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-03-01 22:26:02 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-03-08 15:10:55 +0100 |
| commit | a61c787f9f74a34074f8c69cc0325a65af5c3845 (patch) | |
| tree | aa0525277948548414a2c46574c6267e520ddb4b /package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch | |
| parent | d1c2b25212fdfdf50bafb16cb8aa6197f780408c (diff) | |
| download | upstream-a61c787f9f74a34074f8c69cc0325a65af5c3845.tar.gz upstream-a61c787f9f74a34074f8c69cc0325a65af5c3845.tar.bz2 upstream-a61c787f9f74a34074f8c69cc0325a65af5c3845.zip | |
uboot-imx6: bump to 2020.01 and refresh patches
Update U-Boot to latest release, remove `100-wandboard-enable-fit.patch`
as FIT support was added in commit 5b8585825128 ("wandboard: Add FIT
image support").
Rework `110-mx6cuboxi-mmc-fallback.patch` into two patches as there was
new config option `CONFIG_SPL_FORCE_MMC_BOOT` added upstream which
should provide the same functionality as the previous patch hunk.
Moving Apalis towards generic distro_bootcmd.
Cc: Vladimir Vid <vladimir.vid@sartura.hr>
Cc: Tim Harvey <tharvey@gateworks.com>
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 | 13 |
1 files changed, 1 insertions, 12 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 2b2fde5ec9..111e1b9809 100644 --- a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -1,6 +1,6 @@ --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -290,6 +290,12 @@ static void setup_iomux_enet(void) +@@ -292,6 +292,12 @@ static void setup_iomux_enet(void) udelay(100); } @@ -13,14 +13,3 @@ int board_phy_config(struct phy_device *phydev) { if (phydev->drv->config) ---- a/arch/arm/mach-imx/spl.c -+++ b/arch/arm/mach-imx/spl.c -@@ -176,7 +176,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: |