From 9df2865607f8a94e0fafec3e90c406fbb4bd901b Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Thu, 26 Aug 2021 01:06:42 +0300
Subject: [PATCH] uboot: Fix mmc_autodetect

Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
---
 recipes-bsp/u-boot/compulab/imx8mm.inc        |  2 +-
 .../imx8mm/0094-Fix-mmc_autodetect.patch      | 26 +++++++++++++++++++
 .../0094-mmc_autodetect-workaround.patch      | 25 ------------------
 3 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 recipes-bsp/u-boot/compulab/imx8mm/0094-Fix-mmc_autodetect.patch
 delete mode 100644 recipes-bsp/u-boot/compulab/imx8mm/0094-mmc_autodetect-workaround.patch

diff --git a/recipes-bsp/u-boot/compulab/imx8mm.inc b/recipes-bsp/u-boot/compulab/imx8mm.inc
index 20ecc67..039ec3e 100644
--- a/recipes-bsp/u-boot/compulab/imx8mm.inc
+++ b/recipes-bsp/u-boot/compulab/imx8mm.inc
@@ -92,5 +92,5 @@ SRC_URI_append = " \
 	file://0091-cm-imx8m-mini-config-Enable-startek-ili9881c.patch \
 	file://0092-Migration-to-5.10.35.patch \
 	file://0093-Fix-enable_cache.patch \
-	file://0094-mmc_autodetect-workaround.patch \
+	file://0094-Fix-mmc_autodetect.patch \
 "
diff --git a/recipes-bsp/u-boot/compulab/imx8mm/0094-Fix-mmc_autodetect.patch b/recipes-bsp/u-boot/compulab/imx8mm/0094-Fix-mmc_autodetect.patch
new file mode 100644
index 0000000..1c1c9fb
--- /dev/null
+++ b/recipes-bsp/u-boot/compulab/imx8mm/0094-Fix-mmc_autodetect.patch
@@ -0,0 +1,26 @@
+From 52f44310aba9bd5e3a1c47869d2065fd47cb1520 Mon Sep 17 00:00:00 2001
+From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
+Date: Thu, 26 Aug 2021 01:04:37 +0300
+Subject: [PATCH 94/94] Fix mmc_autodetect
+
+Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
+---
+ board/compulab/common/mmc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/compulab/common/mmc.c b/board/compulab/common/mmc.c
+index db449cb4da..4450cadb99 100644
+--- a/board/compulab/common/mmc.c
++++ b/board/compulab/common/mmc.c
+@@ -9,7 +9,7 @@
+ #include <linux/errno.h>
+ #include <asm/io.h>
+ #include <stdbool.h>
+-#include <mmc.h>
++#include <env.h>
+ 
+ static int check_mmc_autodetect(void)
+ {
+-- 
+2.17.1
+
diff --git a/recipes-bsp/u-boot/compulab/imx8mm/0094-mmc_autodetect-workaround.patch b/recipes-bsp/u-boot/compulab/imx8mm/0094-mmc_autodetect-workaround.patch
deleted file mode 100644
index 6cd3bd7..0000000
--- a/recipes-bsp/u-boot/compulab/imx8mm/0094-mmc_autodetect-workaround.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4a8c126b2b752dc7908a5dc241c61c654dfc123f Mon Sep 17 00:00:00 2001
-From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
-Date: Fri, 13 Aug 2021 22:44:49 +0300
-Subject: [PATCH 94/94] mmc_autodetect workaround
-
-Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
----
- board/compulab/common/mmc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board/compulab/common/mmc.c b/board/compulab/common/mmc.c
-index a5befbb618..db449cb4da 100644
---- a/board/compulab/common/mmc.c
-+++ b/board/compulab/common/mmc.c
-@@ -14,6 +14,7 @@
- static int check_mmc_autodetect(void)
- {
- 	char *autodetect_str = env_get("mmcautodetect");
-+	return 0;
- 
- 	if ((autodetect_str != NULL) &&
- 		(strcmp(autodetect_str, "yes") == 0)) {
--- 
-2.11.0
-