X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=package%2Fboot%2Fuboot-imx6%2Fpatches%2F110-mx6cuboxi-mmc-fallback.patch;fp=package%2Fboot%2Fuboot-imx6%2Fpatches%2F110-mx6cuboxi-mmc-fallback.patch;h=111e1b980918f103c1073dd23f623ffbd38140a4;hp=2b2fde5ec9a6980719ed528658974f9939bd9b38;hb=a61c787f9f74a34074f8c69cc0325a65af5c3845;hpb=d1c2b25212fdfdf50bafb16cb8aa6197f780408c

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: