leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vbe: Drop the U-Boot prefix from the version

Browse Source 
We don't need the U-Boot prefix on the version and in fact it is harmful
since pytest gets confused seeing the U-Boot banner bring displayed when
the version is printed.

Drop the prefix from the string.

We could produce an entirely new string from the component parts, but this
adds to the rodata size and would break the use of version_string as the
only thing which holds this information.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-20 18:23:12 -06:00 committed by Tom Rini
parent c263e21bcb
commit e45d22655a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boot/vbe_simple_os.c
View File

@ -18,7 +18,7 @@
int vbe_simple_fixup_node(ofnode node, struct simple_state *state)
{
char *version;
const char *version, *str;
int ret;
version = strdup(state->fw_version);
@ -31,7 +31,12 @@ int vbe_simple_fixup_node(ofnode node, struct simple_state *state)
ret = ofnode_write_u32(node, "cur-vernum", state->fw_vernum);
if (ret)
return log_msg_ret("num", ret);
ret = ofnode_write_string(node, "bootloader-version", version_string);
/* Drop the 'U-Boot ' at the start */
str = version_string;
if (!strncmp("U-Boot ", str, 7))
str += 7;
ret = ofnode_write_string(node, "bootloader-version", str);
if (ret)
return log_msg_ret("bl", ret);

2
test/boot/vbe_simple.c
View File

@ -77,7 +77,7 @@ static int vbe_simple_test_base(struct unit_test_state *uts)
bl_version = ofnode_read_string(node, "bootloader-version");
ut_assertnonnull(bl_version);
ut_asserteq_str(version_string, bl_version);
ut_asserteq_str(version_string + 7, bl_version);
return 0;
}