projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dts: uniphier: sync DT with latest Linux
[oweals/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
board_late_init.c
diff --git
a/arch/arm/mach-uniphier/board_late_init.c
b/arch/arm/mach-uniphier/board_late_init.c
index 845f047b027da675425f70f1d7bf548b28e2e549..f23295fbd2128016318a72368d62facba60e6e2a 100644
(file)
--- a/
arch/arm/mach-uniphier/board_late_init.c
+++ b/
arch/arm/mach-uniphier/board_late_init.c
@@
-37,10
+37,12
@@
static int uniphier_set_fdt_file(void)
const char *compat;
char dtb_name[256];
int buf_len = 256;
const char *compat;
char dtb_name[256];
int buf_len = 256;
- int ret;
- ret = fdt_get_string(gd->fdt_blob, 0, "compatible", &compat);
- if (ret)
+ if (getenv("fdt_file"))
+ return 0; /* do nothing if it is already set */
+
+ compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
+ if (!compat)
return -EINVAL;
if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX)))
return -EINVAL;
if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX)))
@@
-56,9
+58,7
@@
static int uniphier_set_fdt_file(void)
strncat(dtb_name, ".dtb", buf_len);
strncat(dtb_name, ".dtb", buf_len);
- setenv("fdt_file", dtb_name);
-
- return 0;
+ return setenv("fdt_file", dtb_name);
}
int board_late_init(void)
}
int board_late_init(void)