summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-06-30 15:02:00 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:58:42 -0700
commit27bc27eb3883c013ac61ea2690bad21081b8febd (patch)
tree11384446375ef44e9c4400bc0d2e2049612e360e
parentcc2d80a2767bf71dd23d2a1a0796d9762beb8920 (diff)
Add CONFIG_DISPLAY_BOARDINFO_LATE to display board info on LCD
This option displays board info after stdio is running, so that it will appear on the LCD. BUG=chromium-os:11623 TEST=build and boot with option set, see that this is the first thing displayed on the LCD Change-Id: Ideee94cadbc9670d6f2832692ba019d3e9b260ec Reviewed-on: http://gerrit.chromium.org/gerrit/3501 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
-rw-r--r--README8
-rw-r--r--arch/arm/lib/board.c10
2 files changed, 18 insertions, 0 deletions
diff --git a/README b/README
index 501a52d558..77220edc98 100644
--- a/README
+++ b/README
@@ -2803,6 +2803,14 @@ use the "saveenv" command to store a valid environment.
a larger amount of rapid input, such as happens when
pasting text into the terminal.
+- CONFIG_DISPLAY_BOARDINFO
+ Display information about the board that U-Boot is running on
+ when U-Boot starts up.
+
+- CONFIG_DISPLAY_BOARDINFO_LATE
+ Similar to the previous option, but display this information
+ later, once the LCD is running.
+
Low Level (hardware related) configuration options:
---------------------------------------------------
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index a043648b26..8b314dd671 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -49,6 +49,7 @@
#include <nand.h>
#include <onenand_uboot.h>
#include <mmc.h>
+#include <fdt_decode.h>
#ifdef CONFIG_BITBANGMII
#include <miiphy.h>
@@ -594,6 +595,15 @@ 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
+ checkboard();
+# endif
+#endif
+
#if defined(CONFIG_ARCH_MISC_INIT)
/* miscellaneous arch dependent initialisations */
arch_misc_init ();