Message ID | 5daa7cabcbe1796565dac042dc016ce1c5be0ce1.1436175196.git.marcel.ziswiler@toradex.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On 8 July 2015 at 05:58, Marcel Ziswiler <marcel@ziswiler.com> wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > 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> > --- > Changes in v2: reword commit message as requested by Simon > > common/board_info.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/common/board_info.c b/common/board_info.c index 42d0641..a692f74 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -19,7 +19,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;