arm: mx6: fix NFC clock get/set routines for i.MX6QP,i.MX6UL

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

diff --git a/common/board_info.c b/common/board_info.c
index 42d0641294a86c0c632213dd8a1ed52e96bbd7be..bd5dcfa066358c2cc44ce5d19fcc3e77d555cd09 100644 (file)
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -8,27 +8,23 @@
 
 int __weak checkboard(void)
 {
-       printf("Board: Unknown\n");
        return 0;
 }
 
 /*
  * If the root node of the DTB has a "model" property, show it.
- * If CONFIG_OF_CONTROL is disabled or the "model" property is missing,
- * fall back to checkboard().
+ * Then call checkboard().
  */
 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;
 
        model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
 
-       if (model) {
+       if (model)
                printf("Model: %s\n", model);
-               return 0;
-       }
 #endif
 
        return checkboard();