From 5a3f5e61ca30cc454e7ca5419144598c746caf87 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 9 Sep 2020 15:14:39 +0300 Subject: arm: mvebu: clearfog: don't override set fdtfile env Only set the fdtfile environment variable when not already set. Fixes: 867572f09ebe6 ("ARM: mvebu: clearfog: run-time selection of DT file") Cc: Joel Johnson Reported-by: Andre Heider Signed-off-by: Baruch Siach Reviewed-by: Andre Heider --- board/solidrun/clearfog/clearfog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index d5535ebebe..92443d5177 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -240,6 +240,9 @@ int board_eth_init(struct bd_info *bis) int board_late_init(void) { + if (env_get("fdtfile")) + return 0; + cf_read_tlv_data(); if (sr_product_is(&cf_tlv_data, "Clearfog Base")) -- cgit