qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: fixdep: fix dependency on options surrounded by CONFIG_VAL() 

CONFIG options surrounded by

  CONFIG_IS_ENABLED(...)
  CONFIG_IS_BUILTIN(...)
  CONFIG_IS_MODULE(...)
  CONFIG_VAL(...)

need special care for proper dependency tracking.

I do not remember why, but I missed to add CONFIG_VAL(...) handling.

Change-Id: I6b972c1b6ba564f345250a8e980cb95e3e52c146
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 7d8e9e8e24b247944bbff6ab68e03cac81fde218)
This commit is contained in:
Masahiro Yamada 2017-10-06 10:24:43 +09:00 committed by Kever Yang
parent e33953082a
commit aa0e69ce72
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/basic/fixdep.c
View File

@ -249,10 +249,17 @@ static void parse_config_file(const char *map, size_t len)
if (q - p < 0) if (q - p < 0)
continue; continue;
/* U-Boot also handles CONFIG_IS_{ENABLED/BUILTIN/MODULE} */ /*
* U-Boot also handles
* CONFIG_IS_ENABLED(...)
* CONFIG_IS_BUILTIN(...)
* CONFIG_IS_MODULE(...)
* CONFIG_VAL(...)
*/
if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) || if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) ||
(q - p == 10 && !memcmp(p, "IS_BUILTIN(", 11)) || (q - p == 10 && !memcmp(p, "IS_BUILTIN(", 11)) ||
(q - p == 9 && !memcmp(p, "IS_MODULE(", 10))) { (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) ||
(q - p == 3 && !memcmp(p, "VAL(", 4))) {
p = q + 1; p = q + 1;
for (q = p; q < map + len; q++) for (q = p; q < map + len; q++)
if (*q == ')') if (*q == ')')