From 46f9c839c9c2b1da54bc7a1f786e82d09588aadf Mon Sep 17 00:00:00 2001
From: Jagan Teki <jagan@amarulasolutions.com>
Date: Fri, 12 May 2017 17:18:26 +0530
Subject: [PATCH] engicam: Set console env on board_late_init
Set console env on board_late_init instead of configs.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
board/engicam/common/board.c | 5 +++++
include/configs/imx6qdl_icore.h | 1 -
include/configs/imx6qdl_icore_rqs.h | 1 -
include/configs/imx6ul_geam.h | 1 -
include/configs/imx6ul_isiot.h | 1 -
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index af4ef28dac..e3bb5698f6 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -53,6 +53,11 @@ int board_late_init(void)
break;
}
+ if (is_mx6ul())
+ setenv("console", "ttymxc0");
+ else
+ setenv("console", "ttymxc3");
+
setenv_fdt_file();
return 0;
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 00a533c4bb..f3e8481c94 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -40,7 +40,6 @@
"splashpos=m,m\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index a74ee331bf..8f0128e250 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -35,7 +35,6 @@
"script=boot.scr\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 8cd1466d28..f7c48240c2 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -39,7 +39,6 @@
"script=boot.scr\0" \
"image=uImage\0" \
"fit_image=fit.itb\0" \
- "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index c09a754e9d..2dff5ee78e 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -40,7 +40,6 @@
"image=uImage\0" \
"fit_image=fit.itb\0" \
"splashpos=m,m\0" \
- "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \
--
2.39.5