$target->{parent} = $target{$1};
}
};
- /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
+ /^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1;
/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
+ /^Default-Subtarget:\s*(.+)\s*$/ and $target->{def_subtarget} = $1;
/^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ];
/^Target-Profile:\s*(.+)\s*$/ and do {
$profile = {
$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";
/usb/ and $ret .= "\tselect USB_SUPPORT\n";
/usbgadget/ and $ret .= "\tselect USB_GADGET_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";
+ /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
}
return $ret;
}
sub kver($) {
my $v = shift;
$v =~ tr/\./_/;
- $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+ if (substr($v,0,2) eq "2_") {
+ $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+ } else {
+ $v =~ /(\d+_\d+)(_\d+)?/ and $v = $1;
+ }
return $v;
}
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;
}
if ($target->{arch} =~ /\w/) {
$confstr .= "\tselect $target->{arch}\n";
}
foreach my $dep (@{$target->{depends}}) {
- my $mode = "depends";
+ my $mode = "depends on";
my $flags;
my $name;
$flags =~ /\+/ and $mode = "select";
$flags =~ /@/ and $confstr .= "\t$mode $name\n";
}
- $confstr .= $features;
$confstr .= "$help\n\n";
print $confstr;
}
print <<EOF;
choice
prompt "Target System"
- default TARGET_brcm47xx
+ default TARGET_ar71xx
reset if !DEVEL
EOF
choice
prompt "Subtarget" if HAS_SUBTARGETS
+EOF
+ foreach my $target (@target) {
+ next unless $target->{def_subtarget};
+ print <<EOF;
+ default TARGET_$target->{conf}_$target->{def_subtarget} if TARGET_$target->{conf}
+EOF
+ }
+ print <<EOF;
EOF
foreach my $target (@target) {
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";
print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
}
print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
+ print <<EOF;
+
+config CPU_TYPE
+ string
+EOF
+ foreach my $target (@target) {
+ next if @{$target->{subtargets}} > 0;
+ print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
+ }
+ print "\tdefault \"\"\n";
my %kver;
foreach my $target (@target) {
my $parent_condition = shift;
$dep or $dep = {};
$seen or $seen = {};
+ my @t_depends;
$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;
next if $condition eq $depend;
next if $seen->{"$parent_condition:$depend"};
+ next if $seen->{":$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
# thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's
# depends here as well.
- $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
+ $package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ];
$m = "select";
next if $only_dep;
$flags =~ /@/ or $depend = "PACKAGE_$depend";
if ($condition) {
if ($m =~ /select/) {
+ next if $depend eq $condition;
$depend = "$depend if $condition";
} else {
$depend = "!($condition) || $depend";
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
+
+ foreach my $tdep (@t_depends) {
+ mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+ }
+
foreach my $depend (keys %$dep) {
my $m = $dep->{$depend};
$res .= "\t\t$m $depend\n";
if ($c > 0) {
$title .= ("." x $c). " ". $pkg->{title};
}
+ $title = "\"$title\"";
print "\t";
$pkg->{menu} and print "menu";
print "config PACKAGE_".$pkg->{name}."\n";
- print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n";
+ $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;
}
}
my $depstr = "\$(curdir)/$idx$suffix/compile";
my $depline = get_conditional_dep($condition, $depstr);
if ($depline) {
- $deplines{$dep} = $depline;
+ $deplines{$depline}++;
}
}
- my $depline = join(" ", values %deplines);
+ my $depline = join(" ", sort keys %deplines);
if ($depline) {
$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
}
$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;
}
$depline = get_conditional_dep($condition, $depstr);
if ($depline) {
- $deplines{$idx.$dep} = $depline;
+ $deplines{$depline}++;
}
}
}
}
- my $depline = join(" ", values %deplines);
+ my $depline = join(" ", sort keys %deplines);
if ($depline) {
$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
}