mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 5/5] ARM: i.MX: edmqmx6: choose correct env when booting from SD
Date: Thu, 27 Feb 2014 14:53:23 +0100	[thread overview]
Message-ID: <1393509203-836-5-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1393509203-836-1-git-send-email-l.stach@pengutronix.de>

When booting from SD Card we don't want to load an env
from EMMC.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/datamodul-edm-qmx6/board.c |  9 ++++++++-
 arch/arm/dts/imx6q-dmo-edmqmx6.dts         | 25 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c
index b0b4ae98d446..fd02d7a3de1d 100644
--- a/arch/arm/boards/datamodul-edm-qmx6/board.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/board.c
@@ -121,7 +121,14 @@ static int realq7_device_init(void)
 
 	switch (bootsource_get()) {
 	case BOOTSOURCE_MMC:
-		of_device_enable_path("/chosen/environment-emmc");
+		switch (bootsource_get_instance()) {
+		case 2:
+			of_device_enable_path("/chosen/environment-sd");
+			break;
+		case 3:
+			of_device_enable_path("/chosen/environment-emmc");
+			break;
+		}
 		break;
 	default:
 	case BOOTSOURCE_SPI:
diff --git a/arch/arm/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
index 9fe128410640..4cd1c55ff82e 100644
--- a/arch/arm/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
@@ -20,6 +20,12 @@
 	chosen {
 		linux,stdout-path = "/soc/aips-bus@02100000/serial@021e8000";
 
+		environment-sd {
+			compatible = "barebox,environment";
+			device-path = &usdhc3, "partname:barebox-environment";
+			status = "disabled";
+		};
+
 		environment-emmc {
 			compatible = "barebox,environment";
 			device-path = &usdhc4, "partname:barebox-environment";
@@ -386,6 +392,18 @@
 	pinctrl-0 = <&pinctrl_usdhc3>;
 	vmmc-supply = <&reg_3p3v>;
 	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
+	};
 };
 
 &usdhc4 {
@@ -395,11 +413,16 @@
 	non-removable;
 	bus-width = <8>;
 	status = "okay";
+
 	#address-cells = <1>;
 	#size-cells = <1>;
 
 	partition@0 {
-		label = "barebox-environment";
+		label = "barebox";
 		reg = <0x0 0x80000>;
 	};
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
+	};
 };
-- 
1.8.5.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-02-27 13:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-27 13:53 [PATCH 1/5] ARM: i.MX: edmqmx6: fix startup Lucas Stach
2014-02-27 13:53 ` [PATCH 2/5] ARM: i.MX: edmqmx6: correct MMDC init Lucas Stach
2014-02-27 13:53 ` [PATCH 3/5] ARM: i.MX: edmqmx6: choose the environment at the correct time Lucas Stach
2014-02-27 13:53 ` [PATCH 4/5] ARM: i.MX: edmqmx6: set display GPIOs Lucas Stach
2014-02-27 13:53 ` Lucas Stach [this message]
2014-02-27 20:10 ` [PATCH 1/5] ARM: i.MX: edmqmx6: fix startup Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393509203-836-5-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox