From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Tue, 7 Jun 2016 12:03:44 +0000 (+0900)
Subject: ARM: uniphier: do not overwrite fdt_file environment
X-Git-Tag: v2016.07-rc2~85
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4565a74d56351c99443f964bf81d49007d2be9c4;p=oweals%2Fu-boot.git

ARM: uniphier: do not overwrite fdt_file environment

This code auto-detects the best-match FDT file name, but it should
respect the user's choice if "fdt_file" environment is found in a
saved set of environments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index d9eeacbf3a..a45412677a 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -39,6 +39,9 @@ static int uniphier_set_fdt_file(void)
 	int buf_len = 256;
 	int ret;
 
+	if (getenv("fdt_file"))
+		return 0;	/* do nothing if it is already set */
+
 	ret = fdt_get_string(gd->fdt_blob, 0, "compatible", &compat);
 	if (ret)
 		return -EINVAL;