From: Bastian Krause <bst@pengutronix.de> To: barebox@lists.infradead.org Cc: a.fatoum@pengutronix.de Subject: Re: [PATCH v2 1/2] of: fix up /chosen node even when there are no bootargs Date: Tue, 25 May 2021 10:53:27 +0200 Message-ID: <b66b5544-ae32-7711-4920-65e63927a876@pengutronix.de> (raw) In-Reply-To: <20210414130044.6910-1-bst@pengutronix.de> On 4/14/21 3:00 PM, Bastian Krause wrote: > From: Ahmad Fatoum <a.fatoum@pengutronix.de> > > Currently the /chosen fixups of "reset-source", > "reset-source-instance", "reset-source-device" and "bootsource" do not > happen if no bootargs are available. > > Fix that by moving the actual bootargs fixup to a dedicated function > of_write_bootargs() and only return there early on empty bootargs, but > still perform the /chosen fixups mentioned above. > > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > [bst: dropped new line deletions and modified string comparison, moved of_write_bootargs() call to original position, add commit message] > Signed-off-by: Bastian Krause <bst@pengutronix.de> > --- > No changes since (implicit) v1. > --- > common/oftree.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) Gentle ping. > > diff --git a/common/oftree.c b/common/oftree.c > index 075b9d6b8b..a8e6587a61 100644 > --- a/common/oftree.c > +++ b/common/oftree.c > @@ -161,16 +161,12 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod > free(buf); > } > > -static int of_fixup_bootargs(struct device_node *root, void *unused) > +static int of_write_bootargs(struct device_node *node) > { > - struct device_node *node; > const char *str; > - int err; > - int instance = reset_source_get_instance(); > - struct device_d *dev; > > if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG)) > - watchdog_build_bootargs(boot_get_enabled_watchdog(), root); > + watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node)); > > str = linux_bootargs_get(); > if (!str) > @@ -180,13 +176,23 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) > if (strlen(str) == 0) > return 0; > > + return of_property_write_string(node, "bootargs", str); > +} > + > +static int of_fixup_bootargs(struct device_node *root, void *unused) > +{ > + struct device_node *node; > + int err; > + int instance = reset_source_get_instance(); > + struct device_d *dev; > + > node = of_create_node(root, "/chosen"); > if (!node) > return -ENOMEM; > > of_property_write_string(node, "barebox-version", release_string); > > - err = of_property_write_string(node, "bootargs", str); > + err = of_write_bootargs(node); > if (err) > return err; > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-05-25 8:56 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-14 13:00 Bastian Krause 2021-04-14 13:00 ` [PATCH v2 2/2] of: introduce global.linux.bootargs_append Bastian Krause 2021-05-25 8:53 ` Bastian Krause 2021-05-25 8:53 ` Bastian Krause [this message] 2021-05-26 5:53 ` [PATCH v2 1/2] of: fix up /chosen node even when there are no bootargs 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=b66b5544-ae32-7711-4920-65e63927a876@pengutronix.de \ --to=bst@pengutronix.de \ --cc=a.fatoum@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
mail archive of the barebox mailing list This inbox may be cloned and mirrored by anyone: git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \ barebox@lists.infradead.org barebox@lists.infradead.org public-inbox-index barebox Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git