X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=b0abd78a0c415b935b293ec763210bafc55bffee;hp=bd6dbc54ac02b9ba1fb379c51deae64418228346;hb=96bb7c123b8b47dfc43002edf4a52aceb410f852;hpb=2335304a08827f4f083eba2bfb73163516c5fd57

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index bd6dbc54ac..b0abd78a0c 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -153,7 +153,7 @@ sub target_config_features(@) {
 	my $ret;
 
 	while ($_ = shift @_) {
-		/broken/ and $ret .= "\tdepends BROKEN\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";
@@ -174,6 +174,7 @@ sub target_config_features(@) {
 		/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;
 }
@@ -229,10 +230,11 @@ config TARGET_$target->{conf}
 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;
 	}
@@ -241,7 +243,7 @@ EOF
 		$confstr .= "\tselect $target->{arch}\n";
 	}
 	foreach my $dep (@{$target->{depends}}) {
-		my $mode = "depends";
+		my $mode = "depends on";
 		my $flags;
 		my $name;
 
@@ -270,7 +272,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default TARGET_brcm47xx
+	default TARGET_ar71xx
 	reset if !DEVEL
 	
 EOF
@@ -315,7 +317,7 @@ 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";
@@ -441,7 +443,7 @@ sub mconf_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;
@@ -600,7 +602,7 @@ sub gen_package_config() {
 			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