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

display_options: Refactor to allow obtaining the banner

Browse Source 
Move the display options code into a separate function so that the U-Boot
banner can be obtained from other code. Adjust the 'version' command to
use it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Simon Glass
2017-06-16 12:51:42 -06:00
parent 32e9ec1f88
commit 6c519f2dc4
3 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/display_options.c
View File

@@ -13,13 +13,39 @@
#include <linux/ctype.h>
#include <asm/io.h>
int display_options (void)
char *display_options_get_banner_priv(bool newlines, const char *build_tag,
char *buf, int size)
{
#if defined(BUILD_TAG)
printf ("\n\n%s, Build: %s\n\n", version_string, BUILD_TAG);
#else
printf ("\n\n%s\n\n", version_string);
int len;
len = snprintf(buf, size, "%s%s", newlines ? "\n\n" : "",
version_string);
if (build_tag && len < size)
len += snprintf(buf + len, size - len, ", Build: %s",
build_tag);
if (len > size - 3)
len = size - 3;
strcpy(buf + len, "\n\n");
return buf;
}
#ifndef BUILD_TAG
#define BUILD_TAG NULL
#endif
char *display_options_get_banner(bool newlines, char *buf, int size)
{
return display_options_get_banner_priv(newlines, BUILD_TAG, buf, size);
}
int display_options(void)
{
char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
display_options_get_banner(true, buf, sizeof(buf));
printf("%s", buf);
return 0;
}