Skip to contentSkip to conversation

ARM: mvebu: clearfog: don't override set fdtfile env

PATCH New Baruch Siach 3 participants 3 messages Sep 9, 2020 – Sep 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 board/solidrun/clearfog/clearfog.c | 3 +++
 1 file changed, 3 insertions(+)
board/solidrun/clearfog/clearfog.c +3 -0
index d5535ebebecd..92443d5177d9 100644
@@ -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"))
Signature · 1 line
2.28.0
#2 lore raw

PATCH 1/1 ARM: mvebu: clearfog: don't override set fdtfile env

In reply to Baruch Siach
Quoted 6 lines · Baruch Siach

Only set the fdtfile environment variable when not already set.

Fixes 867572f09ebe6 ("ARM: mvebu: clearfog: run-time selection of DT file")
Cc Joel Johnson <[email protected]>

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 19 lines
---
  board/solidrun/clearfog/clearfog.c | 3 +++
  1 file changed, 3 insertions(+)
board/solidrun/clearfog/clearfog.c +3 -0
index d5535ebebecd..92443d5177d9 100644
@@ -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"))