merge: http://linuxtv.org/hg/~aapot/m920x

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 109 insertions, 31 deletions

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 4fc39383f..d558aaeb6 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -5,6 +5,7 @@ use strict;
 my %depend = ();
 my %minver = ();
 my %config = ();
+my %stringopt = ();
 my %intopt = ();
 my %hexopt = ();
 my %tristate = ();
@@ -70,6 +71,7 @@ sub add_int($)
 {
 	my $arg=shift;
 
+	print "Int: $arg\n" if $debug;
 	exists $config{$arg} or die "Adding unknown int '$arg'";
 	$intopt{$arg} = 0;
 }
@@ -78,10 +80,20 @@ sub add_hex($)
 {
 	my $arg=shift;
 
+	print "Hex: $arg\n" if $debug;
 	exists $config{$arg} or die "Adding unknown hex '$arg'";
 	$hexopt{$arg} = 0;
 }
 
+sub add_string($)
+{
+	my $arg=shift;
+
+	print "String: $arg\n" if $debug;
+	exists $config{$arg} or die "Adding unknown string '$arg'";
+	$stringopt{$arg} = "";
+}
+
 sub set_int_value($$)
 {
 	my $key = shift;
@@ -100,6 +112,15 @@ sub set_hex_value($$)
 	$hexopt{$key} = "0x$val";
 }
 
+sub set_string_value($$)
+{
+	my $key = shift;
+	my $val = shift;
+
+	exists $stringopt{$key} or die "Default for unknown string option '$key'";
+	$stringopt{$key} = "\"$val\"";
+}
+
 sub add_config($)
 {
 	my $arg = shift;
@@ -140,10 +161,8 @@ sub depends($$)
 	my $key = shift;
 	my $deps = shift;
 
-	if(!defined $key || $key eq '') {
-		print "Got bad key with $deps\n";
-		return;
-	}
+	(!defined $key || $key eq '') and
+		die "Got bad key with $deps\n";
 	finddeps($key, $deps);
 	push @{$depends{$key}}, $deps;
 }
@@ -200,7 +219,9 @@ sub checkdeps()
 		my $key = shift;
 		my $deps = $depends{$key};
 		foreach (@$deps) {
+			next if($_ eq '');
 			if (!eval(toperl($_))) {
+				print "Disabling $key, dependency '$_' not met\n" if $debug;
 				$allconfig{$key} = 0;
 				return 0;
 			}
@@ -238,6 +259,9 @@ EOF
 # output combined Kconfig file.
 my @kconfigfiles = ();
 
+# "if" statements found in Kconfig files.
+my @kifs = ();
+
 # Read and parse a Kconfig file.  First argument is base of source
 # directory tree, the second is the file to open (with path).  Recursivly
 # parses Kconfig files from 'source' directives.
@@ -290,6 +314,7 @@ sub open_kconfig($$) {
 			$default_seen = 0;
 			$key = undef;
 		}
+		next if (/^\s*#/ || /^\s*$/); # skip comments and blank lines
 
 		if (m|^\s*source\s+"([^"]+)"\s*$| ||
 		    m|^\s*source\s+(\S+)\s*$|) {
@@ -298,8 +323,10 @@ sub open_kconfig($$) {
 			next;
 		}
 
-		if (m|^\s*config (\w+)\s*$|) {
+		my $nothandled = 0;
+		if (m|^\s*(?:menu)?config (\w+)\s*$|) {
 			$key = $1;
+			print "Found config '$key' at $file:$.\n" if $debug;
 			add_config($key);
 
 			if (exists $minver{$key} &&
@@ -311,42 +338,89 @@ sub open_kconfig($$) {
 			} else {
 				$disabled=0;
 			}
+			# Add dependencies from enclosing if/endif blocks
+			depends($key, $_) foreach (@kifs);
 		} elsif (m|^\s*comment\s+"[^"]*"\s*$|) {
 			$key = 'comment';
 		} elsif (m|^\s*menu\s+"[^"]*"\s*$|) {
 			$key = 'menu';
+			push @kifs, '';  # placeholder for any depends on clauses
+		} elsif (m|^\s*if\s+(.+?)\s*$|) {
+			push @kifs, $1;
+		} elsif (/^\s*end(if|menu)\s*(?:#.*)?$/) {
+			# Won't handle menu/if blocks that aren't strictly
+			# nested, but no one should do that!
+			$#kifs >= 0 or die "Unmatched end$1 at $file:$.\n";
+			pop @kifs;
+		} else {
+			$nothandled = 1;
 		}
+		next unless ($nothandled);
 		# Remaining Kconfig directives only makse sense inside Kconfig blocks
-		next unless(defined $key);
-
-		# Don't process any directives in comment blocks (or menus)
-		next if ($key eq 'comment' || $key eq 'menu');
-
-		add_bool($key) if(/^\s*bool(ean)?\s/);
-		add_tristate($key) if (/^\s*tristate\s/);
-		add_int($key) if (/^\s*int\s/);
-		add_hex($key) if (/^\s*hex\s/);
-
-		depends($key, $1) if (m|^\s*depends on\s+(.+?)\s*$|);
-		selects($key, $1, $3) if (m|^\s*select\s+(\w+)(\s+if\s+(.+?))?\s*$|);
-
-		# Get default for int options
-		if (m|^\s*default "(\d+)"| && exists $intopt{$key}) {
-			set_int_value($key, $1);
+		unless(defined $key) {
+			print "Skipping $file:$. $_" if $debug;
 			next;
 		}
-		# Get default for hex options
-		if (m|^\s*default "(0x)?([[:xdigit:]]+)"| && exists $hexopt{$key}) {
-			set_hex_value($key, $2);
+
+		# Don't process any directives in comment blocks
+		next if ($key eq 'comment');
+
+		# Only depends on lines are accepted in menus
+		if ($key eq 'menu') {
+			if (m|^\s*depends on\s+(.+?)\s*$|) {
+			    my $x = pop @kifs;
+			    $x .= ' && ' if($x ne '');
+			    $x .= "($1)";
+			    push @kifs, $x;
+			} else {
+			    print "Skipping unexpected line in menu stanza $file:$.$_" if $debug;
+			}
 			next;
 		}
-		# Override default for disabled tri/bool options
-		# We don't care about the default for tri/bool options otherwise
-		if (m/^\s*default (y|n|m|"yes"|"no")(\s+if .*)?\s*$/ &&
-		    exists $tristate{$key} && $disabled) {
-			$default_seen = 1;
-			$_ = "\tdefault n\n";
-			next;
+
+		# config type
+		if(/^\s*bool(ean)?\s/) {
+			add_bool($key);
+		} elsif (/^\s*tristate\s/) {
+			add_tristate($key);
+		} elsif (/^\s*int\s/) {
+			add_int($key);
+		} elsif (/^\s*hex\s/) {
+			add_hex($key);
+		} elsif (/^\s*string\s/) {
+			add_string($key);
+
+		# select and depend lines
+		} elsif (m|^\s*depends on\s+(.+?)\s*$|) {
+			depends($key, $1);
+		} elsif (m|^\s*select\s+(\w+)(\s+if\s+(.+?))?\s*$|) {
+			selects($key, $1, $3);
+
+		# default lines
+		} elsif (m|^\s*default\s+(.+?)(?:\s+if .*)?\s*$|) {
+			my $o = $1;
+			# Get default for int options
+			if ($o =~ m|^"(\d+)"$| && exists $intopt{$key}) {
+				set_int_value($key, $1);
+			# Get default for hex options
+			} elsif ($o =~ m|^"(0x)?([[:xdigit:]]+)"$| && exists $hexopt{$key}) {
+				set_hex_value($key, $2);
+			# Get default for string options
+			} elsif ($o =~ m|^"(.*)"$| && exists $stringopt{$key}) {
+				set_string_value($key, $1);
+
+			# Override default for disabled tri/bool options
+			# We don't care about the default for tri/bool options otherwise
+			} elsif ($o =~ /^(y|n|m|"yes"|"no")$/i && exists $tristate{$key}) {
+				if ($disabled) {
+					$default_seen = 1;
+					$_ = "\tdefault n\n";
+				}
+			} else {
+				print "Unknown default at $file:$. $_\n" if $debug;
+			}
+		} else {
+			print "Skipping $file:$. $_" if $debug;
 		}
 	} continue {
 		print OUT $_;
@@ -461,6 +535,7 @@ close OUT;
 disable_config('DVB_AV7110_FIRMWARE');
 disable_config('DVB_CINERGYT2_TUNING');
 disable_config('DVB_FE_CUSTOMISE');
+disable_config('VIDEO_HELPER_CHIPS_AUTO');
 
 # ACI needs some kernel includes that might not be there
 disable_config('SOUND_ACI_MIXER') if (! -e "$kernel/sound/oss/sound_config.h");
@@ -506,6 +581,9 @@ if ($force_kconfig==1 || !-e '.config') {
 	while (my ($key,$value) = each %hexopt) {
 		print OUT "CONFIG_$key=$value\n" if($config{$key});
 	}
+	while (my ($key,$value) = each %stringopt) {
+		print OUT "CONFIG_$key=$value\n" if($config{$key});
+	}
 	close OUT;
 	print "Created default (all yes) .config file\n";
 }