diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-01 15:13:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-11 12:36:08 +0200 |
| commit | 3f1ff6b730ec17ce635fcf38770358d8042e80b4 (patch) | |
| tree | 3b93a1f2f90bcfde6bfecd30d74635e54756c584 /common/console.c | |
| parent | 09da8d4bab923871891e275e83c90419d9235231 (diff) | |
| download | barebox-3f1ff6b730ec17ce635fcf38770358d8042e80b4.tar.gz barebox-3f1ff6b730ec17ce635fcf38770358d8042e80b4.tar.xz | |
move version_string to seperate file
In a noninteractive environment barebox will be compiled without
command support. So move version_string to a seperate file which
is compiled unconditionally.
Also, display the banner when the simple console support is used.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/common/console.c b/common/console.c index 5548a409ac..d33a249c92 100644 --- a/common/console.c +++ b/common/console.c @@ -45,12 +45,6 @@ EXPORT_SYMBOL(console_list); #define CONSOLE_INIT_EARLY 1 #define CONSOLE_INIT_FULL 2 -static void display_banner (void) -{ - printf (RELOC("\n\n%s\n\n"), RELOC_VAR(version_string)); - printf(RELOC("Board: " CONFIG_BOARDINFO "\n")); -} - static int __early_initdata initialized = 0; static int console_std_set(struct device_d *dev, struct param_d *param, @@ -169,7 +163,7 @@ int console_register(struct console_device *newcdev) #ifndef CONFIG_HAS_EARLY_INIT if (first) - display_banner(); + barebox_banner(); #endif return 0; @@ -420,7 +414,7 @@ void early_console_start(const char *name, int baudrate) early_console_init(base, baudrate); INITDATA(initialized) = CONSOLE_INIT_EARLY; INITDATA(early_console_base) = base; - display_banner(); + barebox_banner(); } } |