X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2Fboard_late_init.c;h=f23295fbd2128016318a72368d62facba60e6e2a;hb=52159d27ffe6b2a1a7e874cb2fda5aadbd4f03e5;hp=845f047b027da675425f70f1d7bf548b28e2e549;hpb=a212d6966bfcf393e82e44246d7dfb6de032e82a;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 845f047b02..f23295fbd2 100644
--- 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;
-	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)))
@@ -56,9 +58,7 @@ static int uniphier_set_fdt_file(void)
 
 	strncat(dtb_name, ".dtb", buf_len);
 
-	setenv("fdt_file", dtb_name);
-
-	return 0;
+	return setenv("fdt_file", dtb_name);
 }
 
 int board_late_init(void)