[adm5120] fix support for 2.6.38 kernel

[openwrt.git] / scripts / kconfig.pl

diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl
index 07f03c4..8113273 100755 (executable)
--- a/scripts/kconfig.pl
+++ b/scripts/kconfig.pl
@@ -12,19 +12,32 @@ use strict;
 my @arg;
 my $PREFIX = "CONFIG_";
 
-sub load_config($) {
+sub set_config($$$$) {
+       my $config = shift;
+       my $idx = shift;
+       my $newval = shift;
+       my $mod_plus = shift;
+
+       if (!defined($config->{$idx}) or !$mod_plus or
+           $config->{$idx} eq '#undef' or $newval eq 'y') {
+               $config->{$idx} = $newval;
+       }
+}
+
+sub load_config($$) {
        my $file = shift;
+       my $mod_plus = shift;
        my %config;
 
        open FILE, "$file" or die "can't open file";
        while (<FILE>) {
                chomp;
                /^$PREFIX(.+?)=(.+)/ and do {
-                       $config{$1} = $2;
+                       set_config(\%config, $1, $2, $mod_plus);
                        next;
                };
                /^# $PREFIX(.+?) is not set/ and do {
-                       $config{$1} = "#undef";
+                       set_config(\%config, $1, "#undef", $mod_plus);
                        next;
                };
                /^#/ and next;
@@ -67,13 +80,15 @@ sub config_add($$$) {
        return \%config;
 }
 
-sub config_diff($$) {
+sub config_diff($$$) {
        my $cfg1 = shift;
        my $cfg2 = shift;
+       my $new_only = shift;
        my %config;
        
        foreach my $config (keys %$cfg2) {
                if (!defined($cfg1->{$config}) or $cfg1->{$config} ne $cfg2->{$config}) {
+                       next if $new_only and !defined($cfg1->{$config}) and $cfg2->{$config} eq '#undef';
                        $config{$config} = $cfg2->{$config};
                }
        }
@@ -94,7 +109,7 @@ sub config_sub($$) {
 sub print_cfgline($$) {
        my $name = shift;
        my $val = shift;
-       if ($val eq '#undef') {
+       if ($val eq '#undef' or $val eq 'n') {
                print "# $PREFIX$name is not set\n";
        } else {
                print "$PREFIX$name=$val\n";
@@ -111,14 +126,13 @@ sub dump_config($) {
        }
 }
 
-sub parse_expr($);
-
-sub parse_expr($) {
+sub parse_expr {
        my $pos = shift;
+       my $mod_plus = shift;
        my $arg = $arg[$$pos++];
-       
+
        die "Parse error" if (!$arg);
-       
+
        if ($arg eq '&') {
                my $arg1 = parse_expr($pos);
                my $arg2 = parse_expr($pos);
@@ -129,18 +143,22 @@ sub parse_expr($) {
                return config_add($arg1, $arg2, 0);
        } elsif ($arg =~ /^m\+/) {
                my $arg1 = parse_expr($pos);
-               my $arg2 = parse_expr($pos);
+               my $arg2 = parse_expr($pos, 1);
                return config_add($arg1, $arg2, 1);
        } elsif ($arg eq '>') {
                my $arg1 = parse_expr($pos);
                my $arg2 = parse_expr($pos);
-               return config_diff($arg1, $arg2);
+               return config_diff($arg1, $arg2, 0);
+       } elsif ($arg eq '>+') {
+               my $arg1 = parse_expr($pos);
+               my $arg2 = parse_expr($pos);
+               return config_diff($arg1, $arg2, 1);
        } elsif ($arg eq '-') {
                my $arg1 = parse_expr($pos);
                my $arg2 = parse_expr($pos);
                return config_sub($arg1, $arg2);
        } else {
-               return load_config($arg);
+               return load_config($arg, $mod_plus);
        }
 }