[PATCH] bootm: Fix flags used for bootargs string substitution

Piotr Kubik piotr.kubik at iopsys.eu
Tue Oct 17 12:53:05 CEST 2023


Commit <51bb33846ad2> introduced a feature of bootargs
string substitution and changed a flag used in
bootm_process_cmdline_env() call to be either true or false.
With this flag value, condition in bootm_process_cmdline()
`if (flags & BOOTM_CL_SUBST)` is never true
and process_subst() is never called.

Signed-off-by: Piotr Kubik <piotr.kubik at iopsys.eu>
---
 boot/bootm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot/bootm.c b/boot/bootm.c
index 8f96a80d42..e96489e549 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -778,7 +778,8 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,
 	if (!ret && (states & BOOTM_STATE_OS_BD_T))
 		ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, images);
 	if (!ret && (states & BOOTM_STATE_OS_PREP)) {
-		ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX);
+		ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX ?
+										BOOTM_CL_ALL : 0);
 		if (ret) {
 			printf("Cmdline setup failed (err=%d)\n", ret);
 			ret = CMD_RET_FAILURE;
-- 
2.42.0



More information about the U-Boot mailing list