From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 2/3] i.MX6: phytec: Check environment path selection for errors
Date: Thu, 15 Jan 2015 18:32:35 -0800 [thread overview]
Message-ID: <1421375556-21715-3-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1421375556-21715-1-git-send-email-andrew.smirnov@gmail.com>
Add code to explicitly check for success of of_device_enable_path()
when selecting which media is expected to contain barebox environment.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/boards/phytec-phyflex-imx6/board.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boards/phytec-phyflex-imx6/board.c b/arch/arm/boards/phytec-phyflex-imx6/board.c
index 7ac7928..c731faf 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/board.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/board.c
@@ -65,6 +65,9 @@ static void phyflex_err006282_workaround(void)
static int phytec_pfla02_init(void)
{
+ int ret;
+ char *environment_path;
+
if (!of_machine_is_compatible("phytec,imx6q-pfla02") &&
!of_machine_is_compatible("phytec,imx6dl-pfla02") &&
!of_machine_is_compatible("phytec,imx6s-pfla02"))
@@ -76,17 +79,22 @@ static int phytec_pfla02_init(void)
switch (bootsource_get()) {
case BOOTSOURCE_MMC:
- of_device_enable_path("/chosen/environment-sd");
+ environment_path = "/chosen/environment-sd";
break;
case BOOTSOURCE_NAND:
- of_device_enable_path("/chosen/environment-nand");
+ environment_path = "/chosen/environment-nand";
break;
default:
case BOOTSOURCE_SPI:
- of_device_enable_path("/chosen/environment-spinor");
+ environment_path = "/chosen/environment-spinor";
break;
}
+ ret = of_device_enable_path(environment_path);
+ if (ret < 0)
+ pr_warn("Failed to enable environment partition '%s' (%d)\n",
+ environment_path, ret);
+
return 0;
}
device_initcall(phytec_pfla02_init);
--
2.1.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-01-16 2:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 2:32 [PATCH 1/3] i.MX6: phytec: Separate SoM specific code Andrey Smirnov
2015-01-16 2:32 ` [PATCH v2] i.MX: SPI: Respect SPI_LSB_FIRST flag in mode settings Andrey Smirnov
2015-01-16 2:32 ` Andrey Smirnov [this message]
2015-01-16 2:32 ` [PATCH 3/3] i.MX6: phytec: Allow multiple MMC devices to contain boot environment Andrey Smirnov
2015-01-16 7:12 ` [PATCH 1/3] i.MX6: phytec: Separate SoM specific code 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=1421375556-21715-3-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--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