From: Marcel Ziswiler <marcel.ziswi...@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.ziswi...@toradex.com> Reviewed-by: Simon Glass <s...@chromium.org> --- Changes in v5: split up into separate patches to be picked up by the various subsystem maintainers as suggested by Marek Changes in v2: reword commit message as requested by Simon common/board_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_info.c b/common/board_info.c index 4e5a1f7..839fa5a 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -18,7 +18,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; -- 2.4.3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot