diff options
| author | Joel Johnson <mrjoel@lixil.net> | 2020-03-23 14:21:35 -0600 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2020-04-14 13:16:42 +0200 |
| commit | 8eccd0dda0eea1d8ddc922d55d118f8db31715ad (patch) | |
| tree | 854fd44bf92459d92f39097705e90dc99fec4849 | |
| parent | 009d4cfcf27f9b3bc5fbb2f53731e6c59015aa33 (diff) | |
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>
| -rw-r--r-- | board/solidrun/clearfog/clearfog.c | 2 | ||||
| -rw-r--r-- | include/configs/clearfog.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index fd9bd95a15e..249ea46eb71 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 52945d1703d..8314956db6c 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 |