diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-04-14 15:00:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-26 07:52:50 +0200 |
| commit | e56c6a21bc9ef22762c47aacd1bf582a46750c1e (patch) | |
| tree | 1d41e59005cee298e4309fd00c76bad5c161cfad /common/oftree.c | |
| parent | 5a8cc197456fe3d7a15c672b9bd46f49d3b934dc (diff) | |
| download | barebox-e56c6a21bc9ef22762c47aacd1bf582a46750c1e.tar.gz barebox-e56c6a21bc9ef22762c47aacd1bf582a46750c1e.tar.xz | |
of: fix up /chosen node even when there are no bootargs
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>
Link: https://lore.barebox.org/20210414130044.6910-1-bst@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/oftree.c')
| -rw-r--r-- | common/oftree.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/common/oftree.c b/common/oftree.c index d92a3ca904..8b6d1755ac 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; |