Bump mkknlimg script (f564210642)

This commit is contained in:
MilhouseVH 2015-06-02 14:45:36 +01:00 committed by Stephan Raue
parent d2b3ec5935
commit 0565d4a3da

View File

@ -1,22 +1,47 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# ----------------------------------------------------------------------
# mkknlimg by Phil Elwell for Raspberry Pi
# based on extract-ikconfig by Dick Streefland
#
# (c) 2009,2010 Dick Streefland <dick@streefland.net>
# (c) 2014,2015 Raspberry Pi (Trading) Limited <info@raspberrypi.org>
#
# Licensed under the terms of the GNU General Public License.
# ----------------------------------------------------------------------
use strict; use strict;
use warnings;
use integer; use integer;
use constant FLAG_PI => 1;
use constant FLAG_DTOK => 2;
use constant FLAG_DDTK => 4;
use constant FLAG_283X => 8;
my $trailer_magic = 'RPTL'; my $trailer_magic = 'RPTL';
my $tmpfile1 = "/tmp/mkknlimg_$$.1"; my $tmpfile1 = "/tmp/mkknlimg_$$.1";
my $tmpfile2 = "/tmp/mkknlimg_$$.2"; my $tmpfile2 = "/tmp/mkknlimg_$$.2";
my $dtok = 0; my $dtok = 0;
my $ddtk = 0;
my $is_283x = 0;
while ($ARGV[0] =~ /^-/) while (@ARGV && ($ARGV[0] =~ /^-/))
{ {
my $arg = shift(@ARGV); my $arg = shift(@ARGV);
if ($arg eq '--dtok') if ($arg eq '--dtok')
{ {
$dtok = 1; $dtok = 1;
} }
elsif ($arg eq '--ddtk')
{
$ddtk = 1;
}
elsif ($arg eq '--283x')
{
$is_283x = 1;
}
else else
{ {
print ("* Unknown option '$arg'\n"); print ("* Unknown option '$arg'\n");
@ -29,56 +54,68 @@ usage() if (@ARGV != 2);
my $kernel_file = $ARGV[0]; my $kernel_file = $ARGV[0];
my $out_file = $ARGV[1]; my $out_file = $ARGV[1];
my @wanted_config_lines = if (! -r $kernel_file)
( {
'CONFIG_BCM2708_DT' print ("* File '$kernel_file' not found\n");
); usage();
}
my @wanted_strings = my $wanted_configs =
( {
'bcm2708_fb', 'CONFIG_BCM2708_DT' => FLAG_PI | FLAG_DTOK,
'brcm,bcm2708-pinctrl', 'CONFIG_ARCH_BCM2835' => FLAG_PI | FLAG_DTOK | FLAG_283X,
'brcm,bcm2835-gpio', };
'of_find_property'
); my $wanted_strings =
{
'bcm2708_fb' => FLAG_PI,
'brcm,bcm2835-mmc' => FLAG_PI,
'brcm,bcm2835-sdhost' => FLAG_PI,
'brcm,bcm2708-pinctrl' => FLAG_PI | FLAG_DTOK,
'brcm,bcm2835-gpio' => FLAG_PI | FLAG_DTOK,
'brcm,bcm2835-pm-wdt' => FLAG_PI | FLAG_DTOK | FLAG_283X,
'of_overlay_apply' => FLAG_DTOK | FLAG_DDTK,
};
my $res = try_extract($kernel_file, $tmpfile1); my $res = try_extract($kernel_file, $tmpfile1);
$res ||= try_decompress('\037\213\010', 'xy', 'gunzip', 0,
$res = try_decompress('\037\213\010', 'xy', 'gunzip', 0, $kernel_file, $tmpfile1, $tmpfile2);
$kernel_file, $tmpfile1, $tmpfile2) if (!$res); $res ||= try_decompress('\3757zXZ\000', 'abcde', 'unxz --single-stream', -1,
$res = try_decompress('\3757zXZ\000', 'abcde', 'unxz --single-stream', -1, $kernel_file, $tmpfile1, $tmpfile2);
$kernel_file, $tmpfile1, $tmpfile2) if (!$res); $res ||= try_decompress('BZh', 'xy', 'bunzip2', 0,
$res = try_decompress('BZh', 'xy', 'bunzip2', 0, $kernel_file, $tmpfile1, $tmpfile2);
$kernel_file, $tmpfile1, $tmpfile2) if (!$res); $res ||= try_decompress('\135\0\0\0', 'xxx', 'unlzma', 0,
$res = try_decompress('\135\0\0\0', 'xxx', 'unlzma', 0, $kernel_file, $tmpfile1, $tmpfile2);
$kernel_file, $tmpfile1, $tmpfile2) if (!$res); $res ||= try_decompress('\211\114\132', 'xy', 'lzop -d', 0,
$res = try_decompress('\211\114\132', 'xy', 'lzop -d', 0, $kernel_file, $tmpfile1, $tmpfile2);
$kernel_file, $tmpfile1, $tmpfile2) if (!$res); $res ||= try_decompress('\002\041\114\030', 'xy', 'lz4 -d', 1,
$kernel_file, $tmpfile1, $tmpfile2);
my $append_trailer; my $append_trailer;
my $trailer; my $trailer;
my $kver = '?';
$append_trailer = $dtok;
if ($res) if ($res)
{ {
print("Version: $res->{''}\n"); $kver = $res->{'kver'} || '?';
my $flags = $res->{'flags'};
print("Version: $kver\n");
$append_trailer = $dtok; if ($flags & FLAG_PI)
if (!$dtok)
{ {
if (config_bool($res, 'bcm2708_fb')) $append_trailer = 1;
{ $dtok ||= ($flags & FLAG_DTOK) != 0;
$dtok ||= config_bool($res, 'CONFIG_BCM2708_DT'); $is_283x ||= ($flags & FLAG_283X) != 0;
$dtok ||= config_bool($res, 'brcm,bcm2708-pinctrl'); $ddtk ||= ($flags & FLAG_DDTK) != 0;
$dtok ||= config_bool($res, 'brcm,bcm2835-gpio'); }
$append_trailer = 1; else
} {
else print ("* This doesn't look like a Raspberry Pi kernel. In pass-through mode.\n");
{
print ("* This doesn't look like a Raspberry Pi kernel. In pass-through mode.\n");
}
} }
} }
else elsif (!$dtok)
{ {
print ("* Is this a valid kernel? In pass-through mode.\n"); print ("* Is this a valid kernel? In pass-through mode.\n");
} }
@ -86,12 +123,16 @@ else
if ($append_trailer) if ($append_trailer)
{ {
printf("DT: %s\n", $dtok ? "y" : "n"); printf("DT: %s\n", $dtok ? "y" : "n");
printf("DDT: %s\n", $ddtk ? "y" : "n");
printf("283x: %s\n", $is_283x ? "y" : "n");
my @atoms; my @atoms;
push @atoms, [ $trailer_magic, pack('V', 0) ]; push @atoms, [ $trailer_magic, pack('V', 0) ];
push @atoms, [ 'KVer', $res->{''} ]; push @atoms, [ 'KVer', $kver ];
push @atoms, [ 'DTOK', pack('V', $dtok) ]; push @atoms, [ 'DTOK', pack('V', $dtok) ];
push @atoms, [ 'DDTK', pack('V', $ddtk) ];
push @atoms, [ '283x', pack('V', $is_283x) ];
$trailer = pack_trailer(\@atoms); $trailer = pack_trailer(\@atoms);
$atoms[0]->[1] = pack('V', length($trailer)); $atoms[0]->[1] = pack('V', length($trailer));
@ -99,17 +140,31 @@ if ($append_trailer)
$trailer = pack_trailer(\@atoms); $trailer = pack_trailer(\@atoms);
} }
die "* Failed to open '$kernel_file'\n" if (!open(my $ifh, '<', $kernel_file)); my $ofh;
die "* Failed to create '$out_file'\n" if (!open(my $ofh, '>', $out_file));
my $copybuf;
my $total_len = 0; my $total_len = 0;
while (1)
if ($out_file eq $kernel_file)
{ {
die "* Failed to open '$out_file' for append\n"
if (!open($ofh, '>>', $out_file));
$total_len = tell($ofh);
}
else
{
die "* Failed to open '$kernel_file'\n"
if (!open(my $ifh, '<', $kernel_file));
die "* Failed to create '$out_file'\n"
if (!open($ofh, '>', $out_file));
my $copybuf;
while (1)
{
my $bytes = sysread($ifh, $copybuf, 64*1024); my $bytes = sysread($ifh, $copybuf, 64*1024);
last if (!$bytes); last if (!$bytes);
syswrite($ofh, $copybuf, $bytes); syswrite($ofh, $copybuf, $bytes);
$total_len += $bytes; $total_len += $bytes;
}
close($ifh);
} }
if ($trailer) if ($trailer)
@ -119,7 +174,6 @@ if ($trailer)
syswrite($ofh, $trailer); syswrite($ofh, $trailer);
} }
close($ifh);
close($ofh); close($ofh);
exit($trailer ? 0 : 1); exit($trailer ? 0 : 1);
@ -132,7 +186,7 @@ END {
sub usage sub usage
{ {
print ("Usage: mkknlimg [--dtok] <vmlinux|zImage|bzImage> <outfile>\n"); print ("Usage: mkknlimg [--dtok] [--283x] <vmlinux|zImage|bzImage> <outfile>\n");
exit(1); exit(1);
} }
@ -146,40 +200,9 @@ sub try_extract
chomp($ver); chomp($ver);
my $res = { ''=>$ver }; my $res = { 'kver'=>$ver };
my $string_pattern = '^('.join('|', @wanted_strings).')$'; $res->{'flags'} = strings_to_flags($knl, $wanted_strings) |
configs_to_flags($knl, $tmp, $wanted_configs);
my @matches = `strings \"$knl\" | grep -E \"$string_pattern\"`;
foreach my $match (@matches)
{
chomp($match);
$res->{$match} = 1;
}
my $config_pattern = '^('.join('|', @wanted_config_lines).')=(.*)$';
my $cf1 = 'IKCFG_ST\037\213\010';
my $cf2 = '0123456789';
my $pos = `tr "$cf1\n$cf2" "\n$cf2=" < "$knl" | grep -abo "^$cf2"`;
if ($pos)
{
$pos =~ s/:.*[\r\n]*$//s;
$pos += 8;
my $err = (system("tail -c+$pos \"$knl\" | zcat > $tmp 2> /dev/null") >> 8);
if (($err == 0) || ($err == 2))
{
if (open(my $fh, '<', $tmp))
{
while (my $line = <$fh>)
{
chomp($line);
$res->{$1} = $2 if ($line =~ /$config_pattern/);
}
close($fh);
}
}
}
return $res; return $res;
} }
@ -194,6 +217,7 @@ sub try_decompress
{ {
chomp($pos); chomp($pos);
$pos = (split(/[\r\n]+/, $pos))[$idx]; $pos = (split(/[\r\n]+/, $pos))[$idx];
return undef if (!defined($pos));
$pos =~ s/:.*[\r\n]*$//s; $pos =~ s/:.*[\r\n]*$//s;
my $cmd = "tail -c+$pos \"$knl\" | $zcat > $tmp2 2> /dev/null"; my $cmd = "tail -c+$pos \"$knl\" | $zcat > $tmp2 2> /dev/null";
my $err = (system($cmd) >> 8); my $err = (system($cmd) >> 8);
@ -205,6 +229,59 @@ sub try_decompress
return undef; return undef;
} }
sub strings_to_flags
{
my ($knl, $strings) = @_;
my $string_pattern = '^('.join('|', keys(%$strings)).')$';
my $flags = 0;
my @matches = `strings \"$knl\" | grep -E \"$string_pattern\"`;
foreach my $match (@matches)
{
chomp($match);
$flags |= $strings->{$match};
}
return $flags;
}
sub configs_to_flags
{
my ($knl, $tmp, $configs) = @_;
my $config_pattern = '^('.join('|', keys(%$configs)).')=(.*)$';
my $cf1 = 'IKCFG_ST\037\213\010';
my $cf2 = '0123456789';
my $flags = 0;
my $pos = `tr "$cf1\n$cf2" "\n$cf2=" < "$knl" | grep -abo "^$cf2"`;
if ($pos)
{
$pos =~ s/:.*[\r\n]*$//s;
$pos += 8;
my $err = (system("tail -c+$pos \"$knl\" | zcat > $tmp 2> /dev/null") >> 8);
if (($err == 0) || ($err == 2))
{
if (open(my $fh, '<', $tmp))
{
while (my $line = <$fh>)
{
chomp($line);
if (($line =~ /$config_pattern/) &&
(($2 eq 'y') || ($2 eq 'm')))
{
$flags |= $configs->{$1};
}
}
close($fh);
}
}
}
return $flags;
}
sub pack_trailer sub pack_trailer
{ {
my ($atoms) = @_; my ($atoms) = @_;
@ -216,9 +293,3 @@ sub pack_trailer
} }
return $trailer; return $trailer;
} }
sub config_bool
{
my ($configs, $wanted) = @_;
return (($configs->{$wanted} eq 'y') || ($configs->{$wanted} eq '1'));
}