[PATCH v4 05/12] arm: mvebu: clearfog: Unify DT selection paths

[Joel Johnson]

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

---

v2 changes
  - newly added in V2 series based on run-time rebasing
v3 changes
  - none
v4 changes
  - separate change to explicit pro DT into separate commit

Signed-off-by: Joel Johnson <mrj...@lixil.net>
---
 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 04238d2b05..4019e37016 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -219,6 +219,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 633187d86f..6ca0474461 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -134,7 +134,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.20.1