Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7d8e9e8e24b247944bbff6ab68e03cac81fde218

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 06d326d3a6
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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 <yamada.masahiro@socionext.com>

Showing 1 changed file with 9 additions and 2 deletions Side-by-side Diff

scripts/basic/fixdep.c
Diff comments   View file @ 7d8e9e8
... ... @@ -249,10 +249,17 @@
249 249 if (q - p < 0)
250 250 continue;
251 251  
252   - /* U-Boot also handles CONFIG_IS_{ENABLED/BUILTIN/MODULE} */
  252 + /*
  253 + * U-Boot also handles
  254 + * CONFIG_IS_ENABLED(...)
  255 + * CONFIG_IS_BUILTIN(...)
  256 + * CONFIG_IS_MODULE(...)
  257 + * CONFIG_VAL(...)
  258 + */
253 259 if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) ||
254 260 (q - p == 10 && !memcmp(p, "IS_BUILTIN(", 11)) ||
255   - (q - p == 9 && !memcmp(p, "IS_MODULE(", 10))) {
  261 + (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) ||
  262 + (q - p == 3 && !memcmp(p, "VAL(", 4))) {
256 263 p = q + 1;
257 264 for (q = p; q < map + len; q++)
258 265 if (*q == ')')