summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-06-25 14:11:34 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-06-25 14:11:34 +0200
commite9f8363e17aa265d0e3e5e6033400f10f62c9c05 (patch)
tree3753df3877fc5eebf3aab5789b59999dce805523
parent122c14639da5b3db890c409597030878d2be5e34 (diff)
u-boot-mainline: apalis_imx6: fix set_emmcargs wrapper
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-bsp/u-boot-mainline/files/0001-apalis_imx6-fix-set_emmcargs-wrapper.patch31
-rw-r--r--recipes-bsp/u-boot-mainline/u-boot-common.inc2
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot-mainline/files/0001-apalis_imx6-fix-set_emmcargs-wrapper.patch b/recipes-bsp/u-boot-mainline/files/0001-apalis_imx6-fix-set_emmcargs-wrapper.patch
new file mode 100644
index 0000000..b76ee1e
--- /dev/null
+++ b/recipes-bsp/u-boot-mainline/files/0001-apalis_imx6-fix-set_emmcargs-wrapper.patch
@@ -0,0 +1,31 @@
+From 117a380d31d697cb831a620f92800d215fa52ee3 Mon Sep 17 00:00:00 2001
+From: Igor Opaniuk <igor.opaniuk@toradex.com>
+Date: Tue, 25 Jun 2019 14:48:06 +0300
+Subject: [PATCH] apalis_imx6: fix set_emmcargs wrapper
+
+Fix set_emmcargs wrapper, which prepares proper bootargs for booting
+from eMMC.
+
+Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
+---
+ include/configs/apalis_imx6.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
+index 246d618442..df4296df2a 100644
+--- a/include/configs/apalis_imx6.h
++++ b/include/configs/apalis_imx6.h
+@@ -122,8 +122,8 @@
+ "imx6q-apalis-cam-eval.dtb fat 0 1"
+
+ #define EMMC_BOOTCMD \
+- "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} ro,noatime " \
+- "rootfstype=ext4 rootwait\0" \
++ "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
++ "ro,noatime rootfstype=ext4 rootwait\0" \
+ "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
+ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
+ "${vidargs}; echo Booting from internal eMMC chip...; " \
+--
+2.13.6
+
diff --git a/recipes-bsp/u-boot-mainline/u-boot-common.inc b/recipes-bsp/u-boot-mainline/u-boot-common.inc
index 688a4ae..0e739d4 100644
--- a/recipes-bsp/u-boot-mainline/u-boot-common.inc
+++ b/recipes-bsp/u-boot-mainline/u-boot-common.inc
@@ -45,6 +45,8 @@ SRC_URI += " \
file://0006-configs-colibri-imx6ull-switch-to-DM_VIDEO.patch \
\
file://0001-apalis_imx6-increase-phy-autoneg-timeout.patch \
+ \
+ file://0001-apalis_imx6-fix-set_emmcargs-wrapper.patch \
"
S = "${WORKDIR}/git"