From 8eccd0dda0eea1d8ddc922d55d118f8db31715ad Mon Sep 17 00:00:00 2001
From: Joel Johnson <mrjoel@lixil.net>
Date: Mon, 23 Mar 2020 14:21:35 -0600
Subject: [PATCH] arm: mvebu: clearfog: Unify DT selection paths

Unify the location of DT selection into board_late_init instead of
split between detection and static configuration paths.

Signed-off-by: Joel Johnson <mrjoel@lixil.net>
Reviewed-by: Stefan Roese <sr@denx.de>
---
 board/solidrun/clearfog/clearfog.c | 2 ++
 include/configs/clearfog.h         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index fd9bd95a15..249ea46eb7 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -245,6 +245,8 @@ int board_late_init(void)
 		env_set("fdtfile", "armada-385-clearfog-gtr-l8.dtb");
 	else if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE))
 		env_set("fdtfile", "armada-388-clearfog-base.dtb");
+	else
+		env_set("fdtfile", "armada-388-clearfog.dtb");
 
 	return 0;
 }
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 52945d1703..8314956db6 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -178,7 +178,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
-	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 	"console=ttyS0,115200\0" \
 	BOOTENV
 
-- 
2.39.5