X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fboard_info.c;h=bd5dcfa066358c2cc44ce5d19fcc3e77d555cd09;hb=588a439379b8180507e98f4daa5db2ab6e589dff;hp=42d0641294a86c0c632213dd8a1ed52e96bbd7be;hpb=8e3da9dd113699eed2fa05fcde3c55a2ff410913;p=karo-tx-uboot.git

diff --git a/common/board_info.c b/common/board_info.c
index 42d0641294..bd5dcfa066 100644
--- 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();