mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 04/11] ARM: i.MX: bbu: Convert devicefile to device name
Date: Tue, 18 Sep 2018 15:22:58 -0700	[thread overview]
Message-ID: <20180918222305.6834-5-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180918222305.6834-1-andrew.smirnov@gmail.com>

Data->devicefile can contain absolute path to target device, so we
need to convert it to a device name before we can safely use it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/imx-bbu-internal.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index faa266572..14bc569b7 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -409,8 +409,9 @@ static int imx_bbu_internal_mmcboot_update(struct bbu_handler *handler,
 	char *bootpartvar;
 	const char *bootpart;
 	char *devicefile;
+	const char *devname = devpath_to_name(data->devicefile);
 
-	ret = asprintf(&bootpartvar, "%s.boot", data->devicefile);
+	ret = asprintf(&bootpartvar, "%s.boot", devname);
 	if (ret < 0)
 		return ret;
 
@@ -427,7 +428,7 @@ static int imx_bbu_internal_mmcboot_update(struct bbu_handler *handler,
 		bootpart = "boot0";
 	}
 
-	ret = asprintf(&devicefile, "/dev/%s.%s", data->devicefile, bootpart);
+	ret = asprintf(&devicefile, "/dev/%s.%s", devname, bootpart);
 	if (ret < 0)
 		goto free_bootpartvar;
 
-- 
2.17.1


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

  parent reply	other threads:[~2018-09-18 22:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-18 22:22 [PATCH 00/11] Switch ZII boards to use MMC boot partitions Andrey Smirnov
2018-09-18 22:22 ` [PATCH 01/11] ARM: i.MX: bbu: Add support for v1 header to MMC boot handler Andrey Smirnov
2018-09-18 22:22 ` [PATCH 02/11] ARM: i.MX51: bbu: Add a handler for MMC boot partitions Andrey Smirnov
2018-09-18 22:22 ` [PATCH 03/11] ARM: i.MX: bbu: Check retrun value of getenv() Andrey Smirnov
2018-09-18 22:22 ` Andrey Smirnov [this message]
2018-09-18 22:22 ` [PATCH 05/11] ARM: i.MX: bbu: Detect MMC before reading current boot partition Andrey Smirnov
2018-09-18 22:23 ` [PATCH 06/11] ARM: VFxxx: bbu: Add a handler for MMC boot partitions Andrey Smirnov
2018-09-18 22:23 ` [PATCH 07/11] dts: VFxxx: Add aliases for ESDHC controllers Andrey Smirnov
2018-09-18 22:23 ` [PATCH 08/11] ARM: zii-vf610-dev: Switch MMC BBU to use boot partitions Andrey Smirnov
2018-09-18 22:23 ` [PATCH 09/11] ARM: rdu2: " Andrey Smirnov
2018-09-18 22:23 ` [PATCH 10/11] ARM: rdu1: Change BBU names to match RDU2 Andrey Smirnov
2018-09-18 22:23 ` [PATCH 11/11] ARM: rdu1: Switch MMC BBU to use boot partitions Andrey Smirnov
2018-09-19  7:54 ` [PATCH 00/11] Switch ZII boards to use MMC " 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=20180918222305.6834-5-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