diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-07 21:03:44 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-09 08:18:34 +0900 |
| commit | 4565a74d56351c99443f964bf81d49007d2be9c4 (patch) | |
| tree | 74c5c57f8534d25c5e562132800db0a9ce31c79a /arch/arm/mach-uniphier/board_late_init.c | |
| parent | 80630dad9d95f81a67d4b93e226a79e679393d31 (diff) | |
| download | talos-obmc-uboot-4565a74d56351c99443f964bf81d49007d2be9c4.tar.gz talos-obmc-uboot-4565a74d56351c99443f964bf81d49007d2be9c4.zip | |
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>
Diffstat (limited to 'arch/arm/mach-uniphier/board_late_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |
