[PATCH 10/10] ARM: i.MX6 tqma6x: configure environment from devicetree

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/boards/tqma6x/board.c | 4 ----
 arch/arm/dts/imx6dl-mba6x.dts  | 5 +++++
 arch/arm/dts/imx6q-mba6x.dts   | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c
index 9e81a1d..7878cc6 100644
--- a/arch/arm/boards/tqma6x/board.c
+++ b/arch/arm/boards/tqma6x/board.c
@@ -134,10 +134,6 @@ static int tqma6x_env_init(void)
 	imx6_bbu_internal_mmc_register_handler("emmc", "/dev/mmc2.boot0",
 		0, (void *)flash_header_start, flash_header_end - flash_header_start, 0);
 
-	device_detect_by_name("mmc2");
-
-	default_environment_path = "/dev/mmc2.boot1";
-
 	return 0;
 }
 late_initcall(tqma6x_env_init);
diff --git a/arch/arm/dts/imx6dl-mba6x.dts b/arch/arm/dts/imx6dl-mba6x.dts
index 7840f06..9e4b95f 100644
--- a/arch/arm/dts/imx6dl-mba6x.dts
+++ b/arch/arm/dts/imx6dl-mba6x.dts
@@ -19,6 +19,11 @@
 
 	chosen {
 		linux,stdout-path = &uart2;
+
+		environment-emmc {
+			compatible = "barebox,environment";
+			device-path = &usdhc3, "partname:boot1";
+		};
 	};
 
 	memory {
diff --git a/arch/arm/dts/imx6q-mba6x.dts b/arch/arm/dts/imx6q-mba6x.dts
index f2ca177..5bf1405 100644
--- a/arch/arm/dts/imx6q-mba6x.dts
+++ b/arch/arm/dts/imx6q-mba6x.dts
@@ -19,6 +19,11 @@
 
 	chosen {
 		linux,stdout-path = &uart2;
+
+		environment-emmc {
+			compatible = "barebox,environment";
+			device-path = &usdhc3, "partname:boot1";
+		};
 	};
 
 	memory {
-- 
1.8.3.2