[U-Boot] [PATCH] ARM: uniphier: rename environment variable fdt_name to fdtname
For booting Linux in the generic distro mechanism, cmd/pxe.c retrieves the FDT file name from "fdtname" environment variable.
Rename "fdt_name" to "fdtname" for easier migration to distro boot.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/board_late_init.c | 4 ++-- include/configs/uniphier.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 9dff3f1..6a99572 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 f710c8f..b631f79 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
2018-05-17 19:55 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
For booting Linux in the generic distro mechanism, cmd/pxe.c retrieves the FDT file name from "fdtname" environment variable.
Rename "fdt_name" to "fdtname" for easier migration to distro boot.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Fixup "fdtname" -> "fdtfile" in the log, and applied to u-boot-uniphier.
arch/arm/mach-uniphier/board_late_init.c | 4 ++-- include/configs/uniphier.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 9dff3f1..6a99572 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 f710c8f..b631f79 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
2.7.4
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
participants (1)
-
Masahiro Yamada