Use PHYS_OFFSET.

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index a665361..fe13541 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -22,18 +22,17 @@ sub parse_target_metadata() {
        my ($target, @target, $profile);        
        while (<>) {
                chomp;
-               /^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do {
-                       my $conf = uc $3.'_'.$2;
+               /^Target:\s*(.+)\s*$/ and do {
+                       my $conf = uc $1;
                        $conf =~ tr/\.-/__/;
                        $target = {
-                               id => $1,
                                conf => $conf,
-                               board => $2,
-                               kernel => $3,
+                               board => $1,
                                profiles => []
                        };
                        push @target, $target;
                };
+               /^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;
@@ -139,6 +138,7 @@ sub parse_package_metadata() {
 
 sub gen_kconfig_overrides() {
        my %config;
+       my %kconfig;
        my $package;
        my $pkginfo = shift @ARGV;
        my $cfgfile = shift @ARGV;
@@ -158,19 +158,29 @@ sub gen_kconfig_overrides() {
                        my @config = split /\s+/, $1;
                        foreach my $config (@config) {
                                my $val = 'm';
+                               my $override;
                                if ($config =~ /^(.+?)=(.+)$/) {
                                        $config = $1;
+                                       $override = 1;
                                        $val = $2;
                                }
                                if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
-                                       print "$config=$val\n";
-                               } else {
-                                       print "# $config is not set\n";
+                                       $kconfig{$config} = $val;
+                               } elsif (!$override) {
+                                       $kconfig{$config} or $kconfig{$config} = 'n';
                                }
                        }
                };
        };
        close FILE;
+
+       foreach my $kconfig (sort keys %kconfig) {
+               if ($kconfig{$kconfig} eq 'n') {
+                       print "# $kconfig is not set\n";
+               } else {
+                       print "$kconfig=$kconfig{$kconfig}\n";
+               }
+       }
 }
 
 sub merge_package_lists($$) {
@@ -192,27 +202,25 @@ sub gen_target_mk() {
        my @target = parse_target_metadata();
        
        @target = sort {
-               $a->{id} cmp $b->{id}
+               $a->{board} cmp $b->{board}
        } @target;
        
        foreach my $target (@target) {
                my ($profiles_def, $profiles_eval);
-               my $conf = uc $target->{kernel}.'_'.$target->{board};
-               $conf =~ tr/\.-/__/;
-               
+
                foreach my $profile (@{$target->{profiles}}) {
                        $profiles_def .= "
-  define Profile/$conf\_$profile->{id}
+  define Profile/$target->{conf}\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
     PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";
                        $profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
                        $profiles_def .= "  endef";
                        $profiles_eval .= "
-\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
+\$(eval \$(call AddProfile,$target->{conf}\_$profile->{id}))"
                }
                print "
-ifeq (\$(CONFIG_LINUX_$conf),y)
+ifeq (\$(CONFIG_TARGET_$target->{conf}),y)
   define Target
     KERNEL:=$target->{kernel}
     BOARD:=$target->{board}
@@ -236,12 +244,11 @@ sub target_config_features(@) {
                /broken/ and $ret .= "\tdepends BROKEN\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";
-               /atm/ and $ret .= "\tselect ATM_SUPPORT\n";
                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
-               /video/ and $ret .= "\tselect VIDEO_SUPPORT\n";
                /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
                /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
                /ext2/ and $ret .= "\tselect USES_EXT2\n";
+               /tgz/ and $ret .= "\tselect USES_TGZ\n";
        }
        return $ret;
 }
@@ -258,7 +265,7 @@ sub gen_target_config() {
        print <<EOF;
 choice
        prompt "Target System"
-       default LINUX_2_4_BRCM
+       default TARGET_BRCM_2_4
        reset if !DEVEL
        
 EOF
@@ -279,7 +286,7 @@ EOF
                }
        
                print <<EOF
-config LINUX_$target->{conf}
+config TARGET_$target->{conf}
        bool "$target->{name}"
        select $target->{arch}
        select LINUX_$kernel
@@ -289,58 +296,6 @@ EOF
        }
 
        print <<EOF;
-if DEVEL
-
-config LINUX_2_6_ARM
-       bool "UNSUPPORTED little-endian arm platform"
-       depends BROKEN
-       select LINUX_2_6
-       select arm
-
-config LINUX_2_6_CRIS
-       bool "UNSUPPORTED cris platform"
-       depends BROKEN
-       select LINUX_2_6
-       select cris
-
-config LINUX_2_6_M68K
-       bool "UNSUPPORTED m68k platform"
-       depends BROKEN
-       select LINUX_2_6
-       select m68k
-
-config LINUX_2_6_SH3
-       bool "UNSUPPORTED little-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3
-
-config LINUX_2_6_SH3EB
-       bool "UNSUPPORTED big-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3eb
-
-config LINUX_2_6_SH4
-       bool "UNSUPPORTED little-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4
-
-config LINUX_2_6_SH4EB
-       bool "UNSUPPORTED big-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4eb
-
-config LINUX_2_6_SPARC
-       bool "UNSUPPORTED sparc platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sparc
-
-endif
-
 endchoice
 
 choice
@@ -353,9 +308,9 @@ EOF
                
                foreach my $profile (@$profiles) {
                        print <<EOF;
-config LINUX_$target->{conf}_$profile->{id}
+config TARGET_$target->{conf}_$profile->{id}
        bool "$profile->{name}"
-       depends LINUX_$target->{conf}
+       depends TARGET_$target->{conf}
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
@@ -546,7 +501,7 @@ sub gen_package_mk() {
                }
                if ($config) {
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";
-                       $pkg->{prereq} and print "prereq-$config += $pkg->{src}\n";
+                       $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
                }
        
                my $hasdeps = 0;
@@ -566,12 +521,12 @@ sub gen_package_mk() {
                        undef $idx if $idx =~ /^(kernel)|(base-files)$/;
                        if ($idx) {
                                next if $dep{$pkg->{src}."->".$idx};
-                               $depline .= " $idx\-compile";
+                               $depline .= " \$(curdir)/$idx/compile";
                                $dep{$pkg->{src}."->".$idx} = 1;
                        }
                }
                if ($depline) {
-                       $line .= $pkg->{subdir}."$pkg->{src}-compile: $depline\n";
+                       $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
                }
        }
        
@@ -594,7 +549,7 @@ $cmds \\
        ) > \$@
        
 ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
-  preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
 endif
 EOF
        }