From patchwork Mon Mar 23 20:21:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Johnson X-Patchwork-Id: 244181 List-Id: U-Boot discussion From: mrjoel at lixil.net (Joel Johnson) Date: Mon, 23 Mar 2020 14:21:35 -0600 Subject: [PATCH v6 07/12] arm: mvebu: clearfog: Unify DT selection paths In-Reply-To: <20200323202140.309602-1-mrjoel@lixil.net> References: <20200323202140.309602-1-mrjoel@lixil.net> Message-ID: <20200323202140.309602-8-mrjoel@lixil.net> Unify the location of DT selection into board_late_init instead of split between detection and static configuration paths. Signed-off-by: Joel Johnson Reviewed-by: Stefan Roese --- 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 v5 changes - none v6 changes - none --- 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 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