diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-08-05 17:17:00 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-13 07:19:36 -0400 |
| commit | a9ad18c9d5fe2554753b0f9a52adfd5ebce61147 (patch) | |
| tree | 88c33a82ebcd2a4fe038352730de67145e0b06d9 /common | |
| parent | 7a3e70cfd88cc8062a106ed07bade5a38f146758 (diff) | |
| download | blackbird-obmc-uboot-a9ad18c9d5fe2554753b0f9a52adfd5ebce61147.tar.gz blackbird-obmc-uboot-a9ad18c9d5fe2554753b0f9a52adfd5ebce61147.zip | |
generic-board: allow showing custom board info
Allow showing custom board info from a checkboard() function being
implemented if CONFIG_CUSTOM_BOARDINFO is specified. Previously the
device tree model was always displayed not taking any
CONFIG_CUSTOM_BOARDINFO into account.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_info.c b/common/board_info.c index 6afe98edee..bd5dcfa066 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -17,7 +17,7 @@ int __weak checkboard(void) */ int show_board_info(void) { -#ifdef CONFIG_OF_CONTROL +#if defined(CONFIG_OF_CONTROL) && !defined(CONFIG_CUSTOM_BOARDINFO) DECLARE_GLOBAL_DATA_PTR; const char *model; |
