Patchwork [U-Boot,06/10] arm: Add CONFIG_DISPLAY_BOARDINFO_LATE to display board info on LCD

login
register
mail settings
Submitter Simon Glass
Date Nov. 1, 2012, 11:42 p.m.
Message ID <1351813330-23741-6-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/196416/
State Superseded, archived
Delegated to: Albert ARIBAUD
Headers show

Comments

Simon Glass - Nov. 1, 2012, 11:42 p.m.
This option displays board info after stdio is running, so that it will
appear on the LCD. If it is displayed earlier, the board info will appear
on the serial console but not on the LCD.

Signed-off-by: Simon Glass <sjg@chromium.org>

---
 README               |    9 +++++++++
 arch/arm/lib/board.c |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
Wolfgang Denk - Nov. 3, 2012, 12:33 p.m.
Dear Simon Glass,

In message <1351813330-23741-6-git-send-email-sjg@chromium.org> you wrote:
> This option displays board info after stdio is running, so that it will
> appear on the LCD. If it is displayed earlier, the board info will appear
> on the serial console but not on the LCD.

Note that this is intentional!  We always want to have the output in
the console as soon as possible.


> +- CONFIG_DISPLAY_BOARDINFO
> +		Display information about the board that U-Boot is running on
> +		when U-Boot starts up.

Why do we need a config option for this?

This being the default (and I request that this remains so!), you
would have to touch _ALL_ existing board config files!

> +- CONFIG_DISPLAY_BOARDINFO_LATE
> +		Similar to the previous option, but display this information
> +		later, once stdio is running and output goes to the LCD, if
> +		present.

This makes little sense to me.

Best regards,

Wolfgang Denk
Simon Glass - Nov. 15, 2012, 10:37 p.m.
Hi Wolfgang,

On Sat, Nov 3, 2012 at 5:33 AM, Wolfgang Denk <wd@denx.de> wrote:
> Dear Simon Glass,
>
> In message <1351813330-23741-6-git-send-email-sjg@chromium.org> you wrote:
>> This option displays board info after stdio is running, so that it will
>> appear on the LCD. If it is displayed earlier, the board info will appear
>> on the serial console but not on the LCD.
>
> Note that this is intentional!  We always want to have the output in
> the console as soon as possible.

(Thanks for your comments on this and other patches, and sorry it had
taken a while to get back to this)

The first output on the console is the U-Boot banner. This option does
not touch that at all.

>
>
>> +- CONFIG_DISPLAY_BOARDINFO
>> +             Display information about the board that U-Boot is running on
>> +             when U-Boot starts up.
>
> Why do we need a config option for this?

We already do - I just thought I would document it. Perhaps it should
be in a separate commit.

>
> This being the default (and I request that this remains so!), you
> would have to touch _ALL_ existing board config files!

I don't think it is the default. If I don't define it in my board
file, I get no board info.

>
>> +- CONFIG_DISPLAY_BOARDINFO_LATE
>> +             Similar to the previous option, but display this information
>> +             later, once stdio is running and output goes to the LCD, if
>> +             present.
>
> This makes little sense to me.

Well, since you asked, here is what we see with and without this option:

1a. Without CONFIG_DISPLAY_BOARDINFO_LATE, on serial:

U-Boot 2011.12-02550-g037e1c5-dirty (Nov 15 2012 - 14:29:42) for SMDK5250

CPU:   S5PC520 @ 1700MHz

Board: Google Snow, rev 0
I2C:   ready
DRAM:  2 GiB Elpida DDR3 @ 800MHz
MMC:   S5P MSHC0: 0, S5P MSHC1: 1
SF: Detected W25Q32 with page size 4 KiB, total 4 MiB
*** Warning - bad CRC, using default environment

In:    mkbp-keyb
Out:   lcd
Err:   lcd
Net:   No ethernet found.
Hit any key to stop autoboot:  0
SMDK5250 #


1b. Without CONFIG_DISPLAY_BOARDINFO_LATE, on LCD (note machine info
is missing):

In:    mkbp-keyb
Out:   lcd
Err:   lcd
Net:   No ethernet found.
Hit any key to stop autoboot:  0
SMDK5250 #


2a. With CONFIG_DISPLAY_BOARDINFO_LATE, on serial:

U-Boot 2011.12-02550-g037e1c5 (Nov 15 2012 - 14:27:40) for SMDK5250

CPU:   S5PC520 @ 1700MHz
I2C:   ready
DRAM:  2 GiB Elpida DDR3 @ 800MHz
MMC:   S5P MSHC0: 0, S5P MSHC1: 1
SF: Detected W25Q32 with page size 4 KiB, total 4 MiB
*** Warning - bad CRC, using default environment

Model: Google Snow
In:    mkbp-keyb
Out:   lcd
Err:   lcd
Net:   No ethernet found.
Hit any key to stop autoboot:  0
SMDK5250 #


2b. With CONFIG_DISPLAY_BOARDINFO_LATE, on LCD (note machine info is present):


Model: Google Snow
In:    mkbp-keyb
Out:   lcd
Err:   lcd
Net:   No ethernet found.
Hit any key to stop autoboot:  0
SMDK5250 #



Since the LCD is all that a typical user sees, it is useful to display
the model there.

We may be able to rearrange things some other way one day, but at
present this seems like a convenient way of getting the required
behaviour.

Regards,
Simon

>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
> Each kiss is as the first.
>         -- Miramanee, Kirk's wife, "The Paradise Syndrome",
>            stardate 4842.6

Patch

diff --git a/README b/README
index 589e22a..76a8436 100644
--- a/README
+++ b/README
@@ -3290,6 +3290,15 @@  use the "saveenv" command to store a valid environment.
 		space for already greatly restricted images, including but not
 		limited to NAND_SPL configurations.
 
+- 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 stdio is running and output goes to the LCD, if
+		present.
+
 Low Level (hardware related) configuration options:
 ---------------------------------------------------
 
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index d3053d8..b879507 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -491,6 +491,16 @@  static int should_load_env(void)
 #endif
 }
 
+#if defined(CONFIG_DISPLAY_BOARDINFO_LATE) && defined(CONFIG_OF_CONTROL)
+static void display_fdt_model(const void *blob)
+{
+	const char *model;
+
+	model = (char *)fdt_getprop(blob, 0, "model", NULL);
+	printf("Model: %s\n", model ? model : "<unknown>");
+}
+#endif
+
 /************************************************************************
  *
  * This is the next part if the initialization sequence: we are now
@@ -617,6 +627,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 */
+	display_fdt_model(gd->fdt_blob);
+# else
+	checkboard();
+# endif
+#endif
+
 #if defined(CONFIG_ARCH_MISC_INIT)
 	/* miscellaneous arch dependent initialisations */
 	arch_misc_init();