Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next

[platform/kernel/u-boot.git] / board / ti / common / board_detect.c

diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 3938dea..e09ecda 100644 (file)
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <eeprom.h>
+#include <log.h>
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/omap_common.h>
@@ -668,17 +669,17 @@ void __maybe_unused set_board_info_env(char *name)
 
        if (name)
                env_set("board_name", name);
-       else if (ep->name)
+       else if (strlen(ep->name) != 0)
                env_set("board_name", ep->name);
        else
                env_set("board_name", unknown);
 
-       if (ep->version)
+       if (strlen(ep->version) != 0)
                env_set("board_rev", ep->version);
        else
                env_set("board_rev", unknown);
 
-       if (ep->serial)
+       if (strlen(ep->serial) != 0)
                env_set("board_serial", ep->serial);
        else
                env_set("board_serial", unknown);
@@ -691,22 +692,22 @@ void __maybe_unused set_board_info_env_am6(char *name)
 
        if (name)
                env_set("board_name", name);
-       else if (ep->name)
+       else if (strlen(ep->name) != 0)
                env_set("board_name", ep->name);
        else
                env_set("board_name", unknown);
 
-       if (ep->version)
+       if (strlen(ep->version) != 0)
                env_set("board_rev", ep->version);
        else
                env_set("board_rev", unknown);
 
-       if (ep->software_revision)
+       if (strlen(ep->software_revision) != 0)
                env_set("board_software_revision", ep->software_revision);
        else
                env_set("board_software_revision", unknown);
 
-       if (ep->serial)
+       if (strlen(ep->serial) != 0)
                env_set("board_serial", ep->serial);
        else
                env_set("board_serial", unknown);