$val = $2;
}
if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+ next if $kconfig{$config} eq 'y';
$kconfig{$config} = $val;
} elsif (!$override) {
$kconfig{$config} or $kconfig{$config} = 'n';
my $ret;
while ($_ = shift @_) {
- /broken/ and $ret .= "\tdepends BROKEN\n";
+ /arm_v(\w+)/ and $ret .= "\tselect arm_v$1\n";
+ /broken/ and $ret .= "\tdepends on BROKEN\n";
/audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
/rtc/ and $ret .= "\tselect RTC_SUPPORT\n";
/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
- /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
+ /jffs2$/ and $ret .= "\tselect USES_JFFS2\n";
+ /jffs2_nand/ and $ret .= "\tselect USES_JFFS2_NAND\n";
/ext4/ and $ret .= "\tselect USES_EXT4\n";
/targz/ and $ret .= "\tselect USES_TARGZ\n";
/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
/powerpc64/ and $ret .= "\tselect powerpc64\n";
/nommu/ and $ret .= "\tselect NOMMU\n";
+ /mips16/ and $ret .= "\tselect HAS_MIPS16\n";
}
return $ret;
}
EOF
}
if ($target->{subtarget}) {
- $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
+ $confstr .= "\tdepends on TARGET_$target->{boardconf}\n";
}
if (@{$target->{subtargets}} > 0) {
$confstr .= "\tselect HAS_SUBTARGETS\n";
+ grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
} else {
$confstr .= $features;
}
$confstr .= "\tselect $target->{arch}\n";
}
foreach my $dep (@{$target->{depends}}) {
- my $mode = "depends";
+ my $mode = "depends on";
my $flags;
my $name;
print <<EOF;
choice
prompt "Target System"
- default TARGET_brcm47xx
+ default TARGET_ar71xx
reset if !DEVEL
EOF
print <<EOF;
config TARGET_$target->{conf}_$profile->{id}
bool "$profile->{name}"
- depends TARGET_$target->{conf}
+ depends on TARGET_$target->{conf}
$profile->{config}
EOF
$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
$depends or return;
my @depends = @$depends;
foreach my $depend (@depends) {
- my $m = "depends";
+ my $m = "depends on";
my $flags = "";
$depend =~ s/^([@\+]+)// and $flags = $1;
my $vdep;
$pkg->{hidden} and $title = "";
print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
- foreach my $default (split /\s*,\s*/, $pkg->{default}) {
- print "\t\tdefault $default\n";
+ unless ($pkg->{hidden}) {
+ $pkg->{default} ||= "m if ALL";
+ }
+ if ($pkg->{default}) {
+ foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+ print "\t\tdefault $default\n";
+ }
}
print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
print <<EOF
config UCI_PRECONFIG_$conf
string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
- depends PACKAGE_$preconfig
+ depends on PACKAGE_$preconfig
default "$preconfig{$preconfig}->{$cfg}->{default}"
EOF
}
print_package_features();
print_package_config_category 'Base system';
- foreach my $cat (keys %category) {
+ foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
print_package_config_category $cat;
}
}
$idx = $subdir{$dep}.$dep;
}
$idx .= $suffix;
- undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+ undef $idx if $idx eq 'base-files';
if ($idx) {
my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix;