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>

diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index fd9bd95a15e5d03afbc1c01c41bde2a19edf8dd0..249ea46eb71456d7badd92d16f7710250c705b07 100644 (file)
--- 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 52945d1703dd14ca80833468e3c6bd20e6b04039..8314956db6c167595c968a419f2ddba83d7d234a 100644 (file)
--- 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