diff options
| author | sascha <sascha@nomad.localdomain> | 2007-10-19 11:04:33 +0200 |
|---|---|---|
| committer | sascha <sascha@nomad.localdomain> | 2007-10-19 11:04:33 +0200 |
| commit | ceac76ffceca6e5648c6870dd51103169a476e00 (patch) | |
| tree | b1b834a34874ecc48fb23843ed47846cc458b717 /common/startup.c | |
| parent | 2acbe717c13c6cafb6f6c2c23f3a7758e2e4ea66 (diff) | |
| download | barebox-ceac76ffceca6e5648c6870dd51103169a476e00.tar.gz barebox-ceac76ffceca6e5648c6870dd51103169a476e00.tar.xz | |
Move display_banner() to console.c. This helps us to show
the banner as first message.
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/common/startup.c b/common/startup.c index bdd20ec43d..49d758bd98 100644 --- a/common/startup.c +++ b/common/startup.c @@ -29,7 +29,6 @@ #include <init.h> #include <command.h> #include <malloc.h> -#include <linux/utsrelease.h> #include <mem_malloc.h> #include <debug_ll.h> #include <fs.h> @@ -37,22 +36,9 @@ #include <environment.h> #include <reloc.h> -#ifndef CONFIG_IDENT_STRING -#define CONFIG_IDENT_STRING "" -#endif - extern initcall_t __u_boot_initcalls_start[], __u_boot_early_initcalls_end[], __u_boot_initcalls_end[]; -const char version_string[] = - "U-Boot " UTS_RELEASE " (" __DATE__ " - " __TIME__ ")"CONFIG_IDENT_STRING; - -static void display_banner (void) -{ - printf (RELOC("\n\n%s\n\n"), RELOC_VAR(version_string)); - printf(RELOC("Board: " CONFIG_BOARDINFO "\n")); -} - static void display_meminfo(void) { ulong mstart = mem_malloc_start(); @@ -79,8 +65,6 @@ void early_init (void) (ulong)&__early_init_data_end - (ulong)&__early_init_data_begin); early_console_start(RELOC("psc3"), 115200); - - display_banner(); } #endif /* CONFIG_HAS_EARLY_INIT */ @@ -130,9 +114,6 @@ void start_uboot (void) hang(); } -#ifndef CONFIG_HAS_EARLY_INIT - display_banner(); -#endif display_meminfo(); register_default_env(); @@ -150,9 +131,12 @@ void start_uboot (void) #endif } #endif + printf("running /env/bin/init...\n"); + if (!stat("/env/bin/init", &s)) { - printf("running /env/bin/init\n"); run_command("source /env/bin/init", 0); + } else { + printf("not found\n"); } /* main_loop() can return to retry autoboot, if so just run it again. */ |