From: Robert Karszniewicz <r.karszniewicz@phytec.de>
To: barebox@lists.infradead.org
Subject: [RFC PATCH 3/4] bootm: handle global.bootm.root
Date: Tue, 30 Jun 2020 15:48:33 +0200 [thread overview]
Message-ID: <1593524914-228154-4-git-send-email-r.karszniewicz@phytec.de> (raw)
In-Reply-To: <1593524914-228154-1-git-send-email-r.karszniewicz@phytec.de>
---
common/bootm.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/common/bootm.c b/common/bootm.c
index 3772fa4c2c51..1a9ef0673e55 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -656,7 +656,11 @@ int bootm_boot(struct bootm_data *bootm_data)
if (bootm_data->appendroot) {
char *rootarg;
- rootarg = path_get_linux_rootarg(data->os_file);
+ if (bootm_data->root_dev) {
+ rootarg = path_get_linux_rootarg(bootm_data->root_dev);
+ } else {
+ rootarg = path_get_linux_rootarg(data->os_file);
+ }
if (!IS_ERR(rootarg)) {
printf("Adding \"%s\" to Kernel commandline\n", rootarg);
globalvar_add_simple("linux.bootargs.bootm.appendroot",
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-06-30 13:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 13:48 [RFC PATCH 0/4] Introduce global.bootm.root env var for booting via PARTUUID Robert Karszniewicz
2020-06-30 13:48 ` [RFC PATCH 1/4] bootm: add env var root_dev Robert Karszniewicz
2020-06-30 13:48 ` [RFC PATCH 2/4] globalvar: add bootm.root Robert Karszniewicz
2020-06-30 13:48 ` Robert Karszniewicz [this message]
2020-06-30 13:48 ` [RFC PATCH 4/4] bootm: mount root device before accessing linux_rootarg Robert Karszniewicz
2020-06-30 14:20 ` [RFC PATCH 0/4] Introduce global.bootm.root env var for booting via PARTUUID Robert Karszniewicz
2020-07-01 5:58 ` Sascha Hauer
2020-07-08 6:55 ` Stefan Riedmüller
2020-07-09 14:14 ` Sascha Hauer
2020-07-13 11:18 ` Robert Karszniewicz
2020-07-14 18:37 ` 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=1593524914-228154-4-git-send-email-r.karszniewicz@phytec.de \
--to=r.karszniewicz@phytec.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