dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 15:01:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootstd: Add support for updating elements of the cmdline

Browse Source 
Add a bootflow command to update the command line more easily. This allows
changing a particular parameter rather than editing a very long strings.
It is also easier to handle with scripting.

The new 'bootflow cmdline' command allows getting and setting single
parameters.

Fix up the example output while we are here, since there are a few new
items.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2023-07-12 09:04:39 -06:00
committed by Bin Meng
parent d07861cc7a
commit 82c0938f1d
5 changed files with 293 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
test/boot/bootflow.c
View File

@@ -837,3 +837,111 @@ static int test_bootflow_cmdline_set(struct unit_test_state *uts)
return 0;
}
BOOTSTD_TEST(test_bootflow_cmdline_set, 0);
/* Test of bootflow_cmdline_set_arg() */
static int bootflow_set_arg(struct unit_test_state *uts)
{
struct bootflow s_bflow, *bflow = &s_bflow;
ulong mem_start;
ut_assertok(env_set("bootargs", NULL));
mem_start = ut_check_delta(0);
/* Do a simple sanity check. Rely on bootflow_cmdline() for the rest */
bflow->cmdline = NULL;
ut_assertok(bootflow_cmdline_set_arg(bflow, "fred", "123", false));
ut_asserteq_str(bflow->cmdline, "fred=123");
ut_assertok(bootflow_cmdline_set_arg(bflow, "mary", "and here", false));
ut_asserteq_str(bflow->cmdline, "fred=123 mary=\"and here\"");
ut_assertok(bootflow_cmdline_set_arg(bflow, "mary", NULL, false));
ut_asserteq_str(bflow->cmdline, "fred=123");
ut_assertok(bootflow_cmdline_set_arg(bflow, "fred", NULL, false));
ut_asserteq_ptr(bflow->cmdline, NULL);
ut_asserteq(0, ut_check_delta(mem_start));
ut_assertok(bootflow_cmdline_set_arg(bflow, "mary", "here", true));
ut_asserteq_str("mary=here", env_get("bootargs"));
ut_assertok(env_set("bootargs", NULL));
return 0;
}
BOOTSTD_TEST(bootflow_set_arg, 0);
/* Test of bootflow_cmdline_get_arg() */
static int bootflow_cmdline_get(struct unit_test_state *uts)
{
int pos;
/* empty string */
ut_asserteq(-ENOENT, cmdline_get_arg("", "fred", &pos));
/* arg with empty value */
ut_asserteq(0, cmdline_get_arg("fred= mary", "fred", &pos));
ut_asserteq(5, pos);
/* arg with a value */
ut_asserteq(2, cmdline_get_arg("fred=23", "fred", &pos));
ut_asserteq(5, pos);
/* arg with a value */
ut_asserteq(3, cmdline_get_arg("mary=1 fred=234", "fred", &pos));
ut_asserteq(12, pos);
/* arg with a value, after quoted arg */
ut_asserteq(3, cmdline_get_arg("mary=\"1 2\" fred=234", "fred", &pos));
ut_asserteq(16, pos);
/* arg in the middle */
ut_asserteq(0, cmdline_get_arg("mary=\"1 2\" fred john=23", "fred",
&pos));
ut_asserteq(15, pos);
/* quoted arg */
ut_asserteq(3, cmdline_get_arg("mary=\"1 2\" fred=\"3 4\" john=23",
"fred", &pos));
ut_asserteq(17, pos);
/* args starting with the same prefix */
ut_asserteq(1, cmdline_get_arg("mary=abc johnathon=3 john=1", "john",
&pos));
ut_asserteq(26, pos);
return 0;
}
BOOTSTD_TEST(bootflow_cmdline_get, 0);
static int bootflow_cmdline(struct unit_test_state *uts)
{
ut_assertok(run_command("bootflow scan mmc", 0));
ut_assertok(run_command("bootflow sel 0", 0));
console_record_reset_enable();
ut_asserteq(1, run_command("bootflow cmdline get fred", 0));
ut_assert_nextline("Argument not found");
ut_assert_console_end();
ut_asserteq(0, run_command("bootflow cmdline set fred 123", 0));
ut_asserteq(0, run_command("bootflow cmdline get fred", 0));
ut_assert_nextline("123");
ut_asserteq(0, run_command("bootflow cmdline set mary abc", 0));
ut_asserteq(0, run_command("bootflow cmdline get mary", 0));
ut_assert_nextline("abc");
ut_asserteq(0, run_command("bootflow cmdline delete fred", 0));
ut_asserteq(1, run_command("bootflow cmdline get fred", 0));
ut_assert_nextline("Argument not found");
ut_asserteq(0, run_command("bootflow cmdline clear mary", 0));
ut_asserteq(0, run_command("bootflow cmdline get mary", 0));
ut_assert_nextline_empty();
ut_assert_console_end();
return 0;
}
BOOTSTD_TEST(bootflow_cmdline, 0);