Skip to content

Commit 98d7c75

Browse files
Jiri Slabymasahir0y
authored andcommitted
streamline_config.pl: handle also ${CONFIG_FOO}
streamline_config.pl currently searches for CONFIG options in Kconfig files as $(CONFIG_FOO). But some Kconfigs (e.g. thunderbolt) use ${CONFIG_FOO}. So fix up the regex to accept both. This fixes: $ make LSMOD=`pwd/`/lsmod localmodconfig using config: '.config' thunderbolt config not found!! Signed-off-by: Jiri Slaby <jslaby@suse.cz> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent 43fc0a9 commit 98d7c75

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scripts/kconfig/streamline_config.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ sub convert_vars {
317317
$_ = convert_vars($_, %make_vars);
318318

319319
# collect objects after obj-$(CONFIG_FOO_BAR)
320-
if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
320+
if (/obj-\$[({](CONFIG_[^})]*)[)}]\s*[+:]?=\s*(.*)/) {
321321
$var = $1;
322322
$objs = $2;
323323

0 commit comments

Comments
 (0)