| Message ID | a8914c26c0b8a93490eb10c60753060d542b1105.1599653679.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Commit | 5a3f5e61ca30cc454e7ca5419144598c746caf87 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | ARM: mvebu: clearfog: don't override set fdtfile env | expand |
On 09/09/2020 14:14, Baruch Siach wrote: > Only set the fdtfile environment variable when not already set. > > Fixes: 867572f09ebe6 ("ARM: mvebu: clearfog: run-time selection of DT file") > Cc: Joel Johnson <mrjoel@lixil.net> > Reported-by: Andre Heider <a.heider@gmail.com> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Andre Heider <a.heider@gmail.com>
On 09.09.20 14:14, Baruch Siach wrote: > Only set the fdtfile environment variable when not already set. > > Fixes: 867572f09ebe6 ("ARM: mvebu: clearfog: run-time selection of DT file") > Cc: Joel Johnson <mrjoel@lixil.net> > Reported-by: Andre Heider <a.heider@gmail.com> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Applied to u-boot-marvell/master Thanks, Stefan > --- > 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 d5535ebebecd..92443d5177d9 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")) >
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index d5535ebebecd..92443d5177d9 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"))
Only set the fdtfile environment variable when not already set. Fixes: 867572f09ebe6 ("ARM: mvebu: clearfog: run-time selection of DT file") Cc: Joel Johnson <mrjoel@lixil.net> Reported-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- board/solidrun/clearfog/clearfog.c | 3 +++ 1 file changed, 3 insertions(+)