From 7d8e9e8e24b247944bbff6ab68e03cac81fde218 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 6 Oct 2017 10:24:43 +0900 Subject: [PATCH] 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. Signed-off-by: Masahiro Yamada --- scripts/basic/fixdep.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 9bd0de2..da7fb2c 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -249,10 +249,17 @@ static void parse_config_file(const char *map, size_t len) if (q - p < 0) 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)) || (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; for (q = p; q < map + len; q++) if (*q == ')')