From 4565a74d56351c99443f964bf81d49007d2be9c4 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 7 Jun 2016 21:03:44 +0900 Subject: [PATCH] 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 --- arch/arm/mach-uniphier/board_late_init.c | 3 +++ 1 file changed, 3 insertions(+) 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; -- 2.39.2