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 <[email protected]>
Tested-by: Marcel Ziswiler <[email protected]> # Verdin iMX8M Plus
Signed-off-by: Emanuele Ghidoli <[email protected]>
Signed-off-by: Francesco Dolcini <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>

diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index b351ce64abfcecf8db3dc1a5828e59904515b709..2483a63c6733a6ee3b748228dfd4ea398fbdcda3 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 79a1c92da0a09bb86054621f45c00deb8eeea920..ee87d9f4145f30162a56e5b4f2bb5cb9e8e4b8d7 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 164fcc41f5508224434c9fe05752534a10b9fdfa..0da245374a0d9387b2995e046e76c9bd66b0baca 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 b9a2af33f19f4f578243ab9a01b3027a44f96f99..b10beb447965173e5e9a8f25db3c8df0adce6a84 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 a775f54eb3f42a506836a50902858bdcf8d15dff..9b9fb342c9d9dbd1f96e4bcb5f092b59dde771c7 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 d8cc72f323c54368f76984fe0c7b7575783857b8..2c673a4a6b06898c89c35e6184637b0ac6ef963c 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 784ca7f65f7bc6ea55c00fcb14c9ea4c764407aa..ce19a9c797523ae37fb0944b3f1fdd5ed3010068 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 2e5b02f72675d22e3af1f30a7624c788aaaeee96..c37c5e0af6d9db06ad4ec052dba312310f028b9e 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 5861cf7dc93ecea2e9b31595bb2f62f368993046..97e33d00f0d6fc836178424357323b20fccb07f9 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 8cef098c8e59a045a3f33e64309bd0643e4ce70e..0da247de98f91e0b338120e872a714c33ce0beb1 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 af9f2d379cf4e475bb67a1ddcba4791ec91421de..35920008805fd2a3f199b2a6cfac05317f7923bb 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 ddc4a175da68ccac84e250deaaac1b4450064d2a..cdf645b141774bcb77c2a03da08b9cae7549cf5c 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 44234dc49cd7eb44aa949d533c6ab92803886722..d446e9f1d5ca7d3d5a1318b389393d28854e2263 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 */