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 2/2] bootm: parse initrd and oftree into correct struct members
Date: Fri, 12 Feb 2016 17:58:23 +0100	[thread overview]
Message-ID: <1455296303-32350-2-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1455296303-32350-1-git-send-email-l.stach@pengutronix.de>

The code parsing the oftree and initrd file names is clearly wrong,
leading to bootm not loading oftree or initrd files any more.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/bootm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/bootm.c b/common/bootm.c
index 671f93f615cb..acf814dfe32c 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -505,8 +505,8 @@ int bootm_boot(struct bootm_data *bootm_data)
 	data = xzalloc(sizeof(*data));
 
 	bootm_image_name_and_part(bootm_data->os_file, &data->os_file, &data->os_part);
-	bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_part, &data->os_part);
-	bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_part, &data->os_part);
+	bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_file, &data->oftree_part);
+	bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_file, &data->initrd_part);
 	data->verbose = bootm_data->verbose;
 	data->verify = bootm_data->verify;
 	data->force = bootm_data->force;
-- 
2.1.4


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

  reply	other threads:[~2016-02-12 16:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-12 16:58 [PATCH 1/2] bootm: restore load DT message for plain oftree files Lucas Stach
2016-02-12 16:58 ` Lucas Stach [this message]
2016-02-15  6:33 ` 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=1455296303-32350-2-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