mx6cuboxi: Do not print devicetree model

The mx6cuboxi_defconfig target supports several board
variants. All of these variants use the hummingboard devicetree in U-Boot.

Currently, the devicetree model as well as the board variant name
are shown:

...
Model: SolidRun HummingBoard2 Dual/Quad (1.5som+emmc)
Board: MX6 Cubox-i
...

Printing the devicetree model that is used internally by U-Boot
may confuse users.

Unselect the CONFIG_DISPLAY_BOARDINFO option so that only the
board name is printed in board_late_init() instead.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Christian Gmeiner <cgmeiner@igalia.com>

diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 7dffb96f0a2e1503001a61c2f2b2f3b217b3e905..7f4811d88794c8ac312ec8f18b4e81bd9520cb18 100644 (file)
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -378,37 +378,6 @@ static bool has_emmc(void)
        return (mmc_get_op_cond(mmc, true) < 0) ? 0 : 1;
 }
 
-/* Override the default implementation, DT model is not accurate */
-int checkboard(void)
-{
-       request_detect_gpios();
-
-       switch (board_type()) {
-       case CUBOXI:
-               puts("Board: MX6 Cubox-i");
-               break;
-       case HUMMINGBOARD:
-               puts("Board: MX6 HummingBoard");
-               break;
-       case HUMMINGBOARD2:
-               puts("Board: MX6 HummingBoard2");
-               break;
-       case UNKNOWN:
-       default:
-               puts("Board: Unknown\n");
-               goto out;
-       }
-
-       if (is_rev_15_som())
-               puts(" (som rev 1.5)\n");
-       else
-               puts("\n");
-
-       free_detect_gpios();
-out:
-       return 0;
-}
-
 static int find_ethernet_phy(void)
 {
        struct mii_dev *bus = NULL;
@@ -502,12 +471,15 @@ int board_late_init(void)
        switch (board_type()) {
        case CUBOXI:
                env_set("board_name", "CUBOXI");
+               puts("Board: MX6 Cubox-i");
                break;
        case HUMMINGBOARD:
                env_set("board_name", "HUMMINGBOARD");
+               puts("Board: MX6 HummingBoard");
                break;
        case HUMMINGBOARD2:
                env_set("board_name", "HUMMINGBOARD2");
+               puts("Board: MX6 HummingBoard2");
                break;
        case UNKNOWN:
        default:
@@ -519,8 +491,12 @@ int board_late_init(void)
        else
                env_set("board_rev", "MX6DL");
 
-       if (is_rev_15_som())
+       if (is_rev_15_som()) {
                env_set("som_rev", "V15");
+               puts(" (som rev 1.5)\n");
+       } else {
+               puts("\n");
+       }
 
        if (has_emmc())
                env_set("has_emmc", "yes");

diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 27ceb22599a6d13d23c21232f049abebcfe1bc48..e3aba715aa5890edd67e7843a05cd9cb0506f432 100644 (file)
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -28,6 +28,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin  serial,usbkbd; setenv stdout serial,vidconsole; setenv stderr serial,vidconsole; else setenv stdin  serial; setenv stdout serial; setenv stderr serial; fi;"
 CONFIG_SYS_PBSIZE=532
+# CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_FS_EXT4=y