V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: uniphier: adjust fdt_file environment handling to latest Linux 

The environment fdt_file is useful to remember the appropriate DTB
file name.  Adjust it to the recent renaming in the upstream kernel.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-17 22:18:02 +09:00
parent 1df182ddf7
commit 40749d5a83
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
/* /*
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -28,15 +30,12 @@ static void nand_denali_wp_disable(void)
#endif #endif
} }
#define VENDOR_PREFIX "socionext,"
#define DTB_FILE_PREFIX "uniphier-"
static int uniphier_set_fdt_file(void) static int uniphier_set_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 = 256; int buf_len = sizeof(dtb_name);
if (getenv("fdt_file")) if (getenv("fdt_file"))
return 0; /* do nothing if it is already set */ return 0; /* do nothing if it is already set */
@ -45,15 +44,13 @@ static int uniphier_set_fdt_file(void)
if (!compat) if (!compat)
return -EINVAL; return -EINVAL;
if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX))) /* rip off the vendor prefix "socionext," */
compat = strchr(compat, ',');
if (!compat)
return -EINVAL; return -EINVAL;
compat++;
compat += strlen(VENDOR_PREFIX); strncpy(dtb_name, compat, buf_len);
strncat(dtb_name, DTB_FILE_PREFIX, buf_len);
buf_len -= strlen(DTB_FILE_PREFIX);
strncat(dtb_name, compat, buf_len);
buf_len -= strlen(compat); buf_len -= strlen(compat);
strncat(dtb_name, ".dtb", buf_len); strncat(dtb_name, ".dtb", buf_len);