ARM: imx6: clocks: remove function local definitions of mxc_ccm_reg and anatop_regs

[karo-tx-uboot.git] / common / board_info.c

diff --git a/common/board_info.c b/common/board_info.c
index 4e5a1f7808119d329e71815a6c89b7ea3708da27..bd5dcfa066358c2cc44ce5d19fcc3e77d555cd09 100644 (file)
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -8,7 +8,6 @@
 
 int __weak checkboard(void)
 {
-       printf("Board: Unknown\n");
        return 0;
 }
 
@@ -18,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;