diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
| commit | 4504062b271bf4d1cf256e4e87e156de6029e088 (patch) | |
| tree | a0cac720a2687f2ed4ccf15f473d06bb7c8dcb07 /arch/arm/mach-uniphier/board_late_init.c | |
| parent | 44afdc4a12b9f6f48338e7975e4f08cfe90dba74 (diff) | |
| parent | 42b7600d62ae288a8c12431d232b89b26ec61721 (diff) | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'arch/arm/mach-uniphier/board_late_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index a45412677a0..f23295fbd21 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -37,13 +37,12 @@ static int uniphier_set_fdt_file(void) const char *compat; char dtb_name[256]; 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) + compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL); + if (!compat) return -EINVAL; if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX))) |