board: toradex: Fix variant (wifi/non-wifi) selection

Do not dereference NULL, when "variant" env variable is not present.

Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

diff --git a/board/toradex/verdin-am62/verdin-am62.c b/board/toradex/verdin-am62/verdin-am62.c
index eca2cc8bc7f8af7f71ae82a79acf24bab4bf72e7..100cfb90eb1c99f37e8e17ed48336d5614d513b8 100644 (file)
--- a/board/toradex/verdin-am62/verdin-am62.c
+++ b/board/toradex/verdin-am62/verdin-am62.c
@@ -95,7 +95,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }

diff --git a/board/toradex/verdin-am62p/verdin-am62p.c b/board/toradex/verdin-am62p/verdin-am62p.c
index 43d1c9312fe309f8b12e0cb2f64447942402a14f..a7124ecf823ee7b8183c9cb791199994a084fac3 100644 (file)
--- a/board/toradex/verdin-am62p/verdin-am62p.c
+++ b/board/toradex/verdin-am62p/verdin-am62p.c
@@ -124,7 +124,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }

diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 066e8db678fb1e71382761d9885a258e30dc9c52..04c918a079f30cdc8cdc1471eecc0278c68bd1ae 100644 (file)
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -100,7 +100,7 @@ static void select_dt_from_module_version(void)
                break;
        }
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }

diff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
index e57ec3b689678162e0a5dfbf09e4e7197216c4e4..34ce25512e8b54d30ef57553255b04e5f822c10c 100644 (file)
--- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c
+++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
@@ -90,7 +90,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }