diff options
author | Anton Staaf <robotboy@chromium.org> | 2011-07-14 11:43:52 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:58:57 -0700 |
commit | a5d5c968ddb4dc1d7339d2379b0a8a2f95891a03 (patch) | |
tree | 3d8c6fa8abf2c111ac3a7b38f443fd6f850ed521 /arch | |
parent | e8dec207c28ddd16877d2c04ad725b9f3d944854 (diff) |
Fix displaying board name when CONFIG_OF_CONTROL is not defined
BUG=None
TEST=Build and boot on Seaboard
Change-Id: I59319fff6bc9f4d41fd67ff5202349130880d518
Reviewed-on: http://gerrit.chromium.org/gerrit/4101
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/board.c | 5 | ||||
-rw-r--r-- | arch/arm/lib/board.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c index 52703b24674..8d3ee8df77e 100644 --- a/arch/arm/cpu/armv7/tegra2/board.c +++ b/arch/arm/cpu/armv7/tegra2/board.c @@ -26,6 +26,7 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/tegra2.h> #include <asm/arch/pmc.h> +#include <fdt_decode.h> DECLARE_GLOBAL_DATA_PTR; @@ -69,12 +70,12 @@ int dram_init(void) return 0; } -#ifdef CONFIG_DISPLAY_BOARDINFO +#if defined(CONFIG_DISPLAY_BOARDINFO) || defined(CONFIG_DISPLAY_BOARDINFO_LATE) int checkboard(void) { const char* board_name; #ifdef CONFIG_OF_CONTROL - board_name = get_board_name(); + board_name = fdt_decode_get_model(gd->blob); #else board_name = sysinfo.board_string; #endif diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index e4c0d62f33c..2aaf8852fdb 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -49,7 +49,6 @@ #include <nand.h> #include <onenand_uboot.h> #include <mmc.h> -#include <fdt_decode.h> #ifdef CONFIG_BITBANGMII #include <miiphy.h> @@ -612,13 +611,8 @@ void board_init_r (gd_t *id, ulong dest_addr) console_init_r (); /* fully init console as a device */ -#ifdef CONFIG_DISPLAY_BOARDINFO_LATE -# ifdef CONFIG_OF_CONTROL - /* Put this here so it appears on the LCD, now it is ready */ - printf("Model: %s\n", fdt_decode_get_model(gd->blob)); -# else +#if defined(CONFIG_DISPLAY_BOARDINFO_LATE) checkboard(); -# endif #endif #if defined(CONFIG_ARCH_MISC_INIT) |