diff options
| author | Pali Rohár <pali@kernel.org> | 2021-07-14 16:37:27 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-07-15 10:53:05 +0200 |
| commit | aeff1740b6f4896b13e9c300e60078ebd488f37b (patch) | |
| tree | cacc1a1108b75901d69d1af108f345dbff2ae3cd | |
| parent | 4a8ad5849b3c22d657450070a716501de2bf630f (diff) | |
| download | u-boot-aeff1740b6f4896b13e9c300e60078ebd488f37b.zip u-boot-aeff1740b6f4896b13e9c300e60078ebd488f37b.tar.gz u-boot-aeff1740b6f4896b13e9c300e60078ebd488f37b.tar.bz2 | |
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>
| -rw-r--r-- | board/Marvell/mvebu_armada-37xx/board.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index c630437..5ff940c 100644 --- 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 |