toradex: Use checkboard() instead of show_board_info()

Boards can use a sysinfo driver if a particular model name is needed.
Update this board to use checkboard() directly, rather than having a
weak function laid on top of a weak function.

Make all the checkboard() functions call the new tdx_checkboard() so
that the same information is displayed.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index e2bbaba8b8c1ad89c591f05ef44a5c43962cbc86..b351ce64abfcecf8db3dc1a5828e59904515b709 100644 (file)
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -215,7 +215,7 @@ int checkboard(void)
        build_info();
        print_bootinfo();
 
-       return 0;
+       return tdx_checkboard();
 }
 
 static enum pcb_rev_t get_pcb_revision(void)

diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 85134315918630113fe21df308857a26af1c3f22..79a1c92da0a09bb86054621f45c00deb8eeea920 100644 (file)
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -95,7 +95,7 @@ int checkboard(void)
 {
        puts("Model: Toradex Apalis TK1 2GB\n");
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index fa6b7226fedfe3c750b8779bc8e3d949af001964..dc0e09991ddedd8beb8e00bfa9be232d240ade34 100644 (file)
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -730,7 +730,8 @@ int checkboard(void)
               is_cpu_type(MXC_CPU_MX6D) ? "Dual" : "Quad",
               (gd->ram_size == 0x80000000) ? "2GB" :
               (gd->ram_size == 0x40000000) ? "1GB" : "512MB", it);
-       return 0;
+
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index ef71270d9f2da4d74c97a5fd04ad823c146b7c69..b9a2af33f19f4f578243ab9a01b3027a44f96f99 100644 (file)
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -50,7 +50,7 @@ int checkboard(void)
        printf("Model: Toradex Apalis T30 %dGB\n",
               (gd->ram_size == 0x40000000) ? 1 : 2);
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 48fdb1e0971296756e6fbf62122bb97d03a430be..6c8eeff38fa59af3e702a39d632cb83ade155503 100644 (file)
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -206,7 +206,7 @@ int checkboard(void)
 {
        printf("Model: Toradex Colibri iMX6ULL\n");
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 6c0b09787c8b267f1ce60a1a43347c3e62f748ea..d8cc72f323c54368f76984fe0c7b7575783857b8 100644 (file)
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -121,7 +121,7 @@ int checkboard(void)
        build_info();
        print_bootinfo();
 
-       return 0;
+       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 e6c9b10570d19959a531b64b15647e3e025a62b5..7635c5811d263cf810add22f417d853466502ce6 100644 (file)
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -649,7 +649,8 @@ int checkboard(void)
        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 0;
+
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index f0356af0082b354aadfffdb40213c2baeaa6bb06..c3478b15111bbd329d7cfbc15a377959e6f74357 100644 (file)
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -279,7 +279,7 @@ int checkboard(void)
        printf("Model: Toradex Colibri iMX7%c\n",
               is_cpu_type(MXC_CPU_MX7D) ? 'D' : 'S');
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 1df9697b97ce8cd5dddd83cc9d7efd73e535b46e..5861cf7dc93ecea2e9b31595bb2f62f368993046 100644 (file)
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -77,7 +77,7 @@ int checkboard(void)
               (get_nand_dev_by_index(0)->erasesize >> 10 == 512) ?
               ((gd->ram_size == 0x10000000) ? "1.1B" : "1.1C") : "1.2A");
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index b6b004669c265c3c6675c1270330dec338064986..8cef098c8e59a045a3f33e64309bd0643e4ce70e 100644 (file)
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -32,7 +32,7 @@ int checkboard(void)
 {
        puts("Model: Toradex Colibri T30 1GB\n");
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index dcef2db360a3559b8dff74a7f489c8878874879d..af9f2d379cf4e475bb67a1ddcba4791ec91421de 100644 (file)
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -373,7 +373,7 @@ int checkboard(void)
        else
                puts("Model: Toradex Colibri VF50\n");
 
-       return 0;
+       return tdx_checkboard();
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)

diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index d1449143977ba03399b99e4fab32f4bb6dc98d26..ed8f0a6a4756e0e2f0b477efa6d8fcefd4264a83 100644 (file)
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -96,7 +96,7 @@ static const char *get_board_assembly(u16 ver_assembly)
        return ver_name;
 }
 
-int show_board_info(void)
+int tdx_checkboard(void)
 {
        unsigned char ethaddr[6];
 

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