]> git.sur5r.net Git - u-boot/commitdiff
fixdep: fix dependency on options surrounded by CONFIG_VAL()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 6 Oct 2017 01:24:43 +0000 (10:24 +0900)
committerTom Rini <trini@konsulko.com>
Mon, 16 Oct 2017 13:42:51 +0000 (09:42 -0400)
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 <yamada.masahiro@socionext.com>
scripts/basic/fixdep.c

index 9bd0de2490748730e750dbf8797a3ae19c431c95..da7fb2cd4dde9cd1ca52e8981628fdb9e3ad05f7 100644 (file)
@@ -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 == ')')