diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-01-14 17:07:05 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-01-29 17:09:49 -0700 |
| commit | 0365ffcc0bd6335afb0c866423f3fe401b28ffaa (patch) | |
| tree | ccb6a17bfe475d5238b50169004ec745dc1b84f8 /common/board_r.c | |
| parent | 5468461d1ea05ff99cf206939293480cc86fd2ec (diff) | |
| download | talos-obmc-uboot-0365ffcc0bd6335afb0c866423f3fe401b28ffaa.tar.gz talos-obmc-uboot-0365ffcc0bd6335afb0c866423f3fe401b28ffaa.zip | |
generic-board: show model name in board_init_f() too
The common/board_r.c has show_model_r() to display the model name
if the DTB has a "model" property. It sounds useful to have a similar
function in common/board_f.c too because most of the boards show
their board name before relocation.
Instead of implementing the same function in both common/board_f.c
and common/board_r.c, let's split it up into common/show_board_info.c.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/common/board_r.c b/common/board_r.c index a301cc226f..68a9448b55 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -476,22 +476,6 @@ static int initr_api(void) } #endif -#ifdef CONFIG_DISPLAY_BOARDINFO_LATE -static int show_model_r(void) -{ - /* Put this here so it appears on the LCD, now it is ready */ -# ifdef CONFIG_OF_CONTROL - const char *model; - - model = (char *)fdt_getprop(gd->fdt_blob, 0, "model", NULL); - printf("Model: %s\n", model ? model : "<unknown>"); -# else - checkboard(); -# endif - return 0; -} -#endif - /* enable exceptions */ #ifdef CONFIG_ARM static int initr_enable_interrupts(void) @@ -801,7 +785,7 @@ init_fnc_t init_sequence_r[] = { #endif console_init_r, /* fully init console as a device */ #ifdef CONFIG_DISPLAY_BOARDINFO_LATE - show_model_r, + show_board_info, #endif #ifdef CONFIG_ARCH_MISC_INIT arch_misc_init, /* miscellaneous arch-dependent init */ |
