From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 17 May 2018 10:55:20 +0000 (+0900)
Subject: ARM: uniphier: rename environment variable fdt_file to fdtfile
X-Git-Tag: v2018.07-rc1~127^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c09f1f4fc9866d59056b3d2b8aeb3a1a3688e27;p=oweals%2Fu-boot.git

ARM: uniphier: rename environment variable fdt_file to fdtfile

For booting Linux in the generic distro mechanism, cmd/pxe.c
retrieves the FDT file name from "fdtfile" environment variable.

Rename "fdt_file" to "fdtfile" for easier migration to distro boot.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 9dff3f16a0..6a995728d4 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -38,7 +38,7 @@ static int uniphier_set_fdt_file(void)
 	char dtb_name[256];
 	int buf_len = sizeof(dtb_name);
 
-	if (env_get("fdt_file"))
+	if (env_get("fdtfile"))
 		return 0;	/* do nothing if it is already set */
 
 	compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
@@ -56,7 +56,7 @@ static int uniphier_set_fdt_file(void)
 
 	strncat(dtb_name, ".dtb", buf_len);
 
-	return env_set("fdt_file", dtb_name);
+	return env_set("fdtfile", dtb_name);
 }
 
 int board_late_init(void)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index f710c8fe2a..b631f79df8 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -168,10 +168,10 @@
 		"run boot_common\0" \
 	"tftpboot=tftpboot $kernel_addr_load $bootfile && " \
 		"tftpboot $ramdisk_addr_r $ramdisk_file &&" \
-		"tftpboot $fdt_addr_r $fdt_file &&" \
+		"tftpboot $fdt_addr_r $fdtfile &&" \
 		"run boot_common\0" \
 	"__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
-		"tftpboot $fdt_addr_r $fdt_file &&" \
+		"tftpboot $fdt_addr_r $fdtfile &&" \
 		"setenv ramdisk_addr_r - &&" \
 		"run boot_common\0"
 #endif