mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-27 08:41:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: uniphier: turn uniphier_set_fdt_file() into void function

Browse Source 
For consistency with a function that will be added.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-07-10 20:07:47 +09:00
parent 1f8357c3ab
commit 72cd83ab81
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/mach-uniphier/board_late_init.c
View File

@ -31,24 +31,25 @@ static void nand_denali_wp_disable(void)
#endif #endif
} }
static int uniphier_set_fdt_file(void) static void uniphier_set_env_fdt_file(void)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
const char *compat; const char *compat;
char dtb_name[256]; char dtb_name[256];
int buf_len = sizeof(dtb_name); int buf_len = sizeof(dtb_name);
int ret;
if (env_get("fdtfile")) if (env_get("fdtfile"))
return 0; /* do nothing if it is already set */ return; /* do nothing if it is already set */
compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL); compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
if (!compat) if (!compat)
return -EINVAL; goto fail;
/* rip off the vendor prefix "socionext," */ /* rip off the vendor prefix "socionext," */
compat = strchr(compat, ','); compat = strchr(compat, ',');
if (!compat) if (!compat)
return -EINVAL; goto fail;
compat++; compat++;
strncpy(dtb_name, compat, buf_len); strncpy(dtb_name, compat, buf_len);
@ -56,7 +57,13 @@ static int uniphier_set_fdt_file(void)
strncat(dtb_name, ".dtb", buf_len); strncat(dtb_name, ".dtb", buf_len);
return env_set("fdtfile", dtb_name); ret = env_set("fdtfile", dtb_name);
if (ret)
goto fail;
return;
fail:
pr_warn("\"fdt_file\" environment variable was not set correctly\n");
} }
int board_late_init(void) int board_late_init(void)
@ -96,8 +103,7 @@ int board_late_init(void)
printf("\n"); printf("\n");
if (uniphier_set_fdt_file()) uniphier_set_env_fdt_file();
pr_warn("fdt_file environment was not set correctly\n");
return 0; return 0;
} }