vbe: Drop the U-Boot prefix from the version

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>

diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c
index 7761b9ef65664df8209c04a79ae560e758870a53..058db6154b0876c7c7b83c58b9a220eb9c2a69d4 100644 (file)
--- a/boot/vbe_simple_os.c
+++ b/boot/vbe_simple_os.c
@@ -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);
 

diff --git a/test/boot/vbe_simple.c b/test/boot/vbe_simple.c
index faba9e8f90bee74b53b190c877fbbfc34e6a6a59..a50785dbbf672d89f06e76a5e045643a9fc94b4f 100644 (file)
--- a/test/boot/vbe_simple.c
+++ b/test/boot/vbe_simple.c
@@ -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;
 }