Commit 98d7c754 authored by Jiri Slaby's avatar Jiri Slaby Committed by Masahiro Yamada
Browse files

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: default avatarJiri Slaby <jslaby@suse.cz>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 43fc0a99

scripts/kconfig/streamline_config.pl

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ foreach my $makefile (@makefiles) { 
	$_ = convert_vars($_, %make_vars);



	# collect objects after obj-$(CONFIG_FOO_BAR)

	if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {

	if (/obj-\$[({](CONFIG_[^})]*)[)}]\s*[+:]?=\s*(.*)/) {

	    $var = $1;

	    $objs = $2;