[U-Boot] [PATCH v2 1/6] colibri_imx7/vf: move to custom checkboard_fallback()

Marcel Ziswiler marcel.ziswiler at toradex.com
Wed Sep 28 11:35:03 CEST 2016


Rename checkboard() to checkboard_fallback() in order to avoid a
name clash with our upcoming common implementation thereof.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
---

Changes in v2: None

 board/toradex/colibri_imx7/colibri_imx7.c | 6 +++---
 board/toradex/colibri_vf/colibri_vf.c     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 8eedd65..73cd89c 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -377,10 +377,10 @@ int board_late_init(void)
 	return 0;
 }
 
-int checkboard(void)
+int checkboard_fallback(void)
 {
-	printf("Model: Toradex Colibri iMX7%c\n",
-	       is_cpu_type(MXC_CPU_MX7D) ? 'D' : 'S');
+	printf("Model: Toradex Colibri iMX7%s\n",
+	       is_cpu_type(MXC_CPU_MX7D) ? "D 512MB" : "S 256MB");
 
 	return 0;
 }
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index c65ccb3..c636a8e 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Toradex, Inc.
+ * Copyright 2015-2016 Toradex, Inc.
  *
  * Based on vf610twr.c:
  * Copyright 2013 Freescale Semiconductor, Inc.
@@ -518,12 +518,12 @@ int board_init(void)
 	return 0;
 }
 
-int checkboard(void)
+int checkboard_fallback(void)
 {
 	if (is_colibri_vf61())
-		puts("Board: Colibri VF61\n");
+		puts("Model: Toradex Colibri VF61 256MB\n");
 	else
-		puts("Board: Colibri VF50\n");
+		puts("Model: Toradex Colibri VF50 128MB\n");
 
 	return 0;
 }
-- 
2.5.5



More information about the U-Boot mailing list