efi_loader: selftest: enable APPEND_WRITE tests

[oweals/u-boot.git] / lib / display_options.c

diff --git a/lib/display_options.c b/lib/display_options.c
index 32849821f4e8f10090f97c1f33d8a33266bbac2d..cff20f375523be26aceaa88801eaa3723cc21b60 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -23,7 +23,9 @@ char *display_options_get_banner_priv(bool newlines, const char *build_tag,
                                build_tag);
        if (len > size - 3)
                len = size - 3;
-       strcpy(buf + len, "\n\n");
+       if (len < 0)
+               len = 0;
+       snprintf(buf + len, size - len, "\n\n");
 
        return buf;
 }
@@ -174,7 +176,9 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
                                x = lb.us[i] = *(volatile uint16_t *)data;
                        else
                                x = lb.uc[i] = *(volatile uint8_t *)data;
-#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
+#if defined(CONFIG_SPL_BUILD)
+                       printf(" %x", (uint)x);
+#elif defined(CONFIG_SYS_SUPPORT_64BIT_DATA)
                        printf(" %0*llx", width * 2, (long long)x);
 #else
                        printf(" %0*x", width * 2, x);