From 921f63e5723880bbbaf65429564e5638b7bbd002 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 29 Nov 2023 10:31:19 -0700
Subject: [PATCH] bootflow: Allow setting a cmdline arg with no value
This is supposed to be supported by the 'bootflow cmd' command, at
least according to the help. There is a 'bootflow cmd clear' but it is
often more intuitive to use 'bootcmd cmd set' with an empty value.
Update the command to pass BOOTFLOWCL_EMPTY in this case.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
cmd/bootflow.c | 4 ++--
test/boot/bootflow.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmd/bootflow.c b/cmd/bootflow.c
index 4a47265ebd..cc6dfae166 100644
--- a/cmd/bootflow.c
+++ b/cmd/bootflow.c
@@ -543,9 +543,9 @@ static int do_bootflow_cmdline(struct cmd_tbl *cmdtp, int flag, int argc,
op = argv[1];
arg = argv[2];
if (*op == 's') {
- if (argc < 4)
+ if (argc < 3)
return CMD_RET_USAGE;
- val = argv[3];
+ val = argv[3] ?: (const char *)BOOTFLOWCL_EMPTY;
}
switch (*op) {
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index f3e5a839da..a9b555c779 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -1095,6 +1095,10 @@ static int bootflow_cmdline(struct unit_test_state *uts)
ut_asserteq(0, run_command("bootflow cmdline get mary", 0));
ut_assert_nextline_empty();
+ ut_asserteq(0, run_command("bootflow cmdline set mary abc", 0));
+ ut_asserteq(0, run_command("bootflow cmdline set mary", 0));
+ ut_assert_nextline_empty();
+
ut_assert_console_end();
return 0;
--
2.39.5