arm: mvebu: Espressobin: Fix setting $fdtfile env

Ensure that 'env default -a' always set correct value to $fdtfile, even
when custom user variable is already stored in non-volatile env storage
(means that env_get("fdtfile") call returns non-NULL value).

As default value is now correctly set like if specified at compile time in
CONFIG_EXTRA_ENV_SETTINGS, there is no need to set $fdtfile explicitly via
env_set("fdtfile", ...) call.

So remove wrong skip based on env_get("fdtfile") and then also unneeded
env_set("fdtfile", ...) call.

Fixes: c4df0f6f315c ("arm: mvebu: Espressobin: Set default value for $fdtfile env variable")
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index c630437c0806899c78608eec8321a02dc3f573ee..5ff940cb352ee9a514facbadd67e79b2c426414e 100644 (file)
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -133,9 +133,6 @@ int board_late_init(void)
                device_unbind(dev);
        }
 
-       if (env_get("fdtfile"))
-               return 0;
-
        /* Ensure that 'env default -a' set correct value to $fdtfile */
        if (ddr4 && emmc)
                strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin-v7-emmc.dtb");
@@ -146,10 +143,6 @@ int board_late_init(void)
        else
                strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin.dtb");
 
-       /* If $fdtfile was not set explicitly by user then set default value */
-       if (!env_get("fdtfile"))
-               env_set("fdtfile", ptr + sizeof("fdtfile="));
-
        return 0;
 }
 #endif