toradex: Remove not necessary model prints from checkboard()

Sysinfo prints the model obtained from device tree, checkboard()
take info from hardware and tdx_checkboard() use the model retrieved by
toradex config block.

Remove the print from checkboard() function because the model obtained
from toradex config block is the most complete.
If toradex config block is missing the model info from device tree is
enough.

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> # Verdin iMX8M Plus
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index b351ce6..2483a63 100644 (file)
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -208,16 +208,6 @@ void board_preboot_os(void)
        gpio_direction_output(BKL1_GPIO, 0);
 }
 
-int checkboard(void)
-{
-       puts("Model: Toradex Apalis iMX8\n");
-
-       build_info();
-       print_bootinfo();
-
-       return tdx_checkboard();
-}
-
 static enum pcb_rev_t get_pcb_revision(void)
 {
        unsigned int pcb_vers = 0;

diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 79a1c92..ee87d9f 100644 (file)
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -91,13 +91,6 @@ int arch_misc_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       puts("Model: Toradex Apalis TK1 2GB\n");
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 164fcc4..0da2453 100644 (file)
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -716,27 +716,6 @@ int board_late_init(void)
 }
 #endif /* CONFIG_BOARD_LATE_INIT */
 
-int checkboard(void)
-{
-       char it[] = " IT";
-       int minc, maxc;
-
-       switch (get_cpu_temp_grade(&minc, &maxc)) {
-       case TEMP_AUTOMOTIVE:
-       case TEMP_INDUSTRIAL:
-               break;
-       case TEMP_EXTCOMMERCIAL:
-       default:
-               it[0] = 0;
-       };
-       printf("Model: Toradex Apalis iMX6 %s %s%s\n",
-              is_cpu_type(MXC_CPU_MX6D) ? "Dual" : "Quad",
-              (gd->ram_size == 0x80000000) ? "2GB" :
-              (gd->ram_size == 0x40000000) ? "1GB" : "512MB", it);
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index b9a2af3..b10beb4 100644 (file)
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -45,14 +45,6 @@ int arch_misc_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       printf("Model: Toradex Apalis T30 %dGB\n",
-              (gd->ram_size == 0x40000000) ? 1 : 2);
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index a775f54..9b9fb34 100644 (file)
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -205,13 +205,6 @@ int board_late_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       printf("Model: Toradex Colibri iMX6ULL\n");
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index d8cc72f..2c673a4 100644 (file)
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -114,16 +114,6 @@ int board_phy_config(struct phy_device *phydev)
 }
 #endif
 
-int checkboard(void)
-{
-       puts("Model: Toradex Colibri iMX8X\n");
-
-       build_info();
-       print_bootinfo();
-
-       return tdx_checkboard();
-}
-
 static void select_dt_from_module_version(void)
 {
        /*

diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 784ca7f..ce19a9c 100644 (file)
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -636,26 +636,6 @@ int board_late_init(void)
 }
 #endif /* CONFIG_BOARD_LATE_INIT */
 
-int checkboard(void)
-{
-       char it[] = " IT";
-       int minc, maxc;
-
-       switch (get_cpu_temp_grade(&minc, &maxc)) {
-       case TEMP_AUTOMOTIVE:
-       case TEMP_INDUSTRIAL:
-               break;
-       case TEMP_EXTCOMMERCIAL:
-       default:
-               it[0] = 0;
-       };
-       printf("Model: Toradex Colibri iMX6 %s %sMB%s\n",
-              is_cpu_type(MXC_CPU_MX6DL) ? "DualLite" : "Solo",
-              (gd->ram_size == 0x20000000) ? "512" : "256", it);
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 2e5b02f..c37c5e0 100644 (file)
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -273,14 +273,6 @@ void reset_cpu(void)
 }
 #endif
 
-int checkboard(void)
-{
-       printf("Model: Toradex Colibri iMX7%c\n",
-              is_cpu_type(MXC_CPU_MX7D) ? 'D' : 'S');
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 5861cf7..97e33d0 100644 (file)
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -70,16 +70,6 @@ int arch_misc_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       printf("Model: Toradex Colibri T20 %dMB V%s\n",
-              (gd->ram_size == 0x10000000) ? 256 : 512,
-              (get_nand_dev_by_index(0)->erasesize >> 10 == 512) ?
-              ((gd->ram_size == 0x10000000) ? "1.1B" : "1.1C") : "1.2A");
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index 8cef098..0da247d 100644 (file)
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -28,13 +28,6 @@ int arch_misc_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       puts("Model: Toradex Colibri T30 1GB\n");
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index af9f2d3..3592000 100644 (file)
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -366,16 +366,6 @@ int board_init(void)
        return 0;
 }
 
-int checkboard(void)
-{
-       if (is_colibri_vf61())
-               puts("Model: Toradex Colibri VF61\n");
-       else
-               puts("Model: Toradex Colibri VF50\n");
-
-       return tdx_checkboard();
-}
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {

diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index ddc4a17..cdf645b 100644 (file)
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -96,7 +96,12 @@ static const char *get_board_assembly(u16 ver_assembly)
        return ver_name;
 }
 
-int tdx_checkboard(void)
+__weak int print_bootinfo(void)
+{
+       return 0;
+}
+
+int checkboard(void)
 {
        unsigned char ethaddr[6];
 
@@ -144,6 +149,8 @@ int tdx_checkboard(void)
 #endif
        }
 
+       print_bootinfo();
+
        /*
         * Check if environment contains a valid MAC address,
         * set the one from config block if not

diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h
index 44234dc..d446e9f 100644 (file)
--- a/board/toradex/common/tdx-common.h
+++ b/board/toradex/common/tdx-common.h
@@ -11,6 +11,5 @@
 
 int ft_common_board_setup(void *blob, struct bd_info *bd);
 u32 get_board_revision(void);
-int tdx_checkboard(void);
 
 #endif /* _TDX_COMMON_H */