1 files changed, 0 insertions, 481 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0023-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch b/target/linux/brcm2708/patches-4.1/0023-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch
deleted file mode 100644
index d843f37afd..0000000000
--- a/target/linux/brcm2708/patches-4.1/0023-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch
+++ /dev/null
@@ -1,481 +0,0 @@
-From e8a7ea84bd95e08fd11b88eb859526bcb9dbfceb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 11 May 2015 09:00:42 +0100
-Subject: [PATCH 023/222] scripts: Add mkknlimg and knlinfo scripts from tools
- repo
-
-The Raspberry Pi firmware looks for a trailer on the kernel image to
-determine whether it was compiled with Device Tree support enabled.
-If the firmware finds a kernel without this trailer, or which has a
-trailer indicating that it isn't DT-capable, it disables DT support
-and reverts to using ATAGs.
-
-The mkknlimg utility adds that trailer, having first analysed the
-image to look for signs of DT support and the kernel version string.
-
-knlinfo displays the contents of the trailer in the given kernel image.
-
-scripts/mkknlimg: Add support for ARCH_BCM2835
-
-Add a new trailer field indicating whether this is an ARCH_BCM2835
-build, as opposed to MACH_BCM2708/9. If the loader finds this flag
-is set it changes the default base dtb file name from bcm270x...
-to bcm283y...
-
-Also update knlinfo to show the status of the field.
----
- scripts/knlinfo  | 168 +++++++++++++++++++++++++++++++++
- scripts/mkknlimg | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 443 insertions(+)
- create mode 100755 scripts/knlinfo
- create mode 100755 scripts/mkknlimg
-
---- /dev/null
-+++ b/scripts/knlinfo
-@@ -0,0 +1,168 @@
-+#!/usr/bin/env perl
-+# ----------------------------------------------------------------------
-+# knlinfo by Phil Elwell for Raspberry Pi
-+#
-+# (c) 2014,2015 Raspberry Pi (Trading) Limited <info@raspberrypi.org>
-+#
-+# Licensed under the terms of the GNU General Public License.
-+# ----------------------------------------------------------------------
-+
-+use strict;
-+use integer;
-+
-+use Fcntl ":seek";
-+
-+my $trailer_magic = 'RPTL';
-+
-+my %atom_formats =
-+(
-+    'DTOK' => \&format_bool,
-+    'KVer' => \&format_string,
-+    '283x' => \&format_bool,
-+);
-+
-+if (@ARGV != 1)
-+{
-+	print ("Usage: knlinfo <kernel image>\n");
-+	exit(1);
-+}
-+
-+my $kernel_file = $ARGV[0];
-+
-+
-+my ($atoms, $pos) = read_trailer($kernel_file);
-+
-+exit(1) if (!$atoms);
-+
-+printf("Kernel trailer found at %d/0x%x:\n", $pos, $pos);
-+
-+foreach my $atom (@$atoms)
-+{
-+    printf("  %s: %s\n", $atom->[0], format_atom($atom));
-+}
-+
-+exit(0);
-+
-+sub read_trailer
-+{
-+	my ($kernel_file) = @_;
-+	my $fh;
-+
-+	if (!open($fh, '<', $kernel_file))
-+	{
-+		print ("* Failed to open '$kernel_file'\n");
-+		return undef;
-+	}
-+
-+	if (!seek($fh, -12, SEEK_END))
-+	{
-+		print ("* seek error in '$kernel_file'\n");
-+		return undef;
-+	}
-+
-+	my $last_bytes;
-+	sysread($fh, $last_bytes, 12);
-+
-+	my ($trailer_len, $data_len, $magic) = unpack('VVa4', $last_bytes);
-+
-+	if (($magic ne $trailer_magic) || ($data_len != 4))
-+	{
-+		print ("* no trailer\n");
-+		return undef;
-+	}
-+	if (!seek($fh, -12, SEEK_END))
-+	{
-+		print ("* seek error in '$kernel_file'\n");
-+		return undef;
-+	}
-+
-+	$trailer_len -= 12;
-+
-+	while ($trailer_len > 0)
-+	{
-+		if ($trailer_len < 8)
-+		{
-+			print ("* truncated atom header in trailer\n");
-+			return undef;
-+		}
-+		if (!seek($fh, -8, SEEK_CUR))
-+		{
-+			print ("* seek error in '$kernel_file'\n");
-+			return undef;
-+		}
-+		$trailer_len -= 8;
-+
-+		my $atom_hdr;
-+		sysread($fh, $atom_hdr, 8);
-+		my ($atom_len, $atom_type) = unpack('Va4', $atom_hdr);
-+
-+		if ($trailer_len < $atom_len)
-+		{
-+			print ("* truncated atom data in trailer\n");
-+			return undef;
-+		}
-+
-+		my $rounded_len = (($atom_len + 3) & ~3);
-+		if (!seek($fh, -(8 + $rounded_len), SEEK_CUR))
-+		{
-+			print ("* seek error in '$kernel_file'\n");
-+			return undef;
-+		}
-+		$trailer_len -= $rounded_len;
-+
-+		my $atom_data;
-+		sysread($fh, $atom_data, $atom_len);
-+
-+		if (!seek($fh, -$atom_len, SEEK_CUR))
-+		{
-+			print ("* seek error in '$kernel_file'\n");
-+			return undef;
-+		}
-+
-+		push @$atoms, [ $atom_type, $atom_data ];
-+	}
-+
-+ 	if (($$atoms[-1][0] eq "\x00\x00\x00\x00") &&
-+	    ($$atoms[-1][1] eq ""))
-+	{
-+		pop @$atoms;
-+	}
-+	else
-+	{
-+		print ("* end marker missing from trailer\n");
-+	}
-+
-+	return ($atoms, tell($fh));
-+}
-+
-+sub format_atom
-+{
-+    my ($atom) = @_;
-+
-+    my $format_func = $atom_formats{$atom->[0]} || \&format_hex;
-+    return $format_func->($atom->[1]);
-+}
-+
-+sub format_bool
-+{
-+    my ($data) = @_;
-+    return unpack('V', $data) ? 'true' : 'false';
-+}
-+
-+sub format_int
-+{
-+    my ($data) = @_;
-+    return unpack('V', $data);
-+}
-+
-+sub format_string
-+{
-+    my ($data) = @_;
-+    return '"'.$data.'"';
-+}
-+
-+sub format_hex
-+{
-+    my ($data) = @_;
-+    return unpack('H*', $data);
-+}
---- /dev/null
-+++ b/scripts/mkknlimg
-@@ -0,0 +1,275 @@
-+#!/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 warnings;
-+use integer;
-+
-+my $trailer_magic = 'RPTL';
-+
-+my $tmpfile1 = "/tmp/mkknlimg_$$.1";
-+my $tmpfile2 = "/tmp/mkknlimg_$$.2";
-+
-+my $dtok = 0;
-+my $is_283x = 0;
-+
-+while (@ARGV && ($ARGV[0] =~ /^-/))
-+{
-+    my $arg = shift(@ARGV);
-+    if ($arg eq '--dtok')
-+    {
-+	$dtok = 1;
-+    }
-+    elsif ($arg eq '--283x')
-+    {
-+	$is_283x = 1;
-+    }
-+    else
-+    {
-+	print ("* Unknown option '$arg'\n");
-+	usage();
-+    }
-+}
-+
-+usage() if (@ARGV != 2);
-+
-+my $kernel_file = $ARGV[0];
-+my $out_file = $ARGV[1];
-+
-+if (! -r $kernel_file)
-+{
-+    print ("* File '$kernel_file' not found\n");
-+    usage();
-+}
-+
-+my @wanted_config_lines =
-+(
-+	'CONFIG_BCM2708_DT',
-+	'CONFIG_ARCH_BCM2835'
-+);
-+
-+my @wanted_strings =
-+(
-+	'bcm2708_fb',
-+	'brcm,bcm2835-mmc',
-+	'brcm,bcm2835-sdhost',
-+	'brcm,bcm2708-pinctrl',
-+	'brcm,bcm2835-gpio',
-+	'brcm,bcm2835-pm-wdt'
-+);
-+
-+my $res = try_extract($kernel_file, $tmpfile1);
-+$res = try_decompress('\037\213\010', 'xy',    'gunzip', 0,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+$res = try_decompress('\3757zXZ\000', 'abcde', 'unxz --single-stream', -1,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+$res = try_decompress('BZh',          'xy',    'bunzip2', 0,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+$res = try_decompress('\135\0\0\0',   'xxx',   'unlzma', 0,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+$res = try_decompress('\211\114\132', 'xy',    'lzop -d', 0,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+$res = try_decompress('\002\041\114\030', 'xy',    'lz4 -d', 1,
-+		      $kernel_file, $tmpfile1, $tmpfile2) if (!$res);
-+
-+my $append_trailer;
-+my $trailer;
-+my $kver = '?';
-+
-+$append_trailer = $dtok;
-+
-+if ($res)
-+{
-+    $kver = $res->{''} || '?';
-+    print("Version: $kver\n");
-+
-+    $append_trailer = $dtok;
-+    if (!$dtok)
-+    {
-+	if (config_bool($res, 'bcm2708_fb') ||
-+	    config_bool($res, 'brcm,bcm2835-mmc') ||
-+	    config_bool($res, 'brcm,bcm2835-sdhost'))
-+	{
-+	    $dtok ||= config_bool($res, 'CONFIG_BCM2708_DT');
-+	    $dtok ||= config_bool($res, 'CONFIG_ARCH_BCM2835');
-+	    $dtok ||= config_bool($res, 'brcm,bcm2708-pinctrl');
-+	    $dtok ||= config_bool($res, 'brcm,bcm2835-gpio');
-+	    $is_283x ||= config_bool($res, 'CONFIG_ARCH_BCM2835');
-+	    $is_283x ||= config_bool($res, 'brcm,bcm2835-pm-wdt');
-+	    $append_trailer = 1;
-+	}
-+	else
-+	{
-+	    print ("* This doesn't look like a Raspberry Pi kernel. In pass-through mode.\n");
-+	}
-+    }
-+}
-+elsif (!$dtok)
-+{
-+    print ("* Is this a valid kernel? In pass-through mode.\n");
-+}
-+
-+if ($append_trailer)
-+{
-+    printf("DT: %s\n", $dtok ? "y" : "n");
-+    printf("283x: %s\n", $is_283x ? "y" : "n");
-+
-+    my @atoms;
-+
-+    push @atoms, [ $trailer_magic, pack('V', 0) ];
-+    push @atoms, [ 'KVer', $kver ];
-+    push @atoms, [ 'DTOK', pack('V', $dtok) ];
-+    push @atoms, [ '283x', pack('V', $is_283x) ];
-+
-+    $trailer = pack_trailer(\@atoms);
-+    $atoms[0]->[1] = pack('V', length($trailer));
-+
-+    $trailer = pack_trailer(\@atoms);
-+}
-+
-+my $ofh;
-+my $total_len = 0;
-+
-+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);
-+	last if (!$bytes);
-+	syswrite($ofh, $copybuf, $bytes);
-+	$total_len += $bytes;
-+    }
-+    close($ifh);
-+}
-+
-+if ($trailer)
-+{
-+    # Pad to word-alignment
-+    syswrite($ofh, "\x000\x000\x000", (-$total_len & 0x3));
-+    syswrite($ofh, $trailer);
-+}
-+
-+close($ofh);
-+
-+exit($trailer ? 0 : 1);
-+
-+END {
-+	unlink($tmpfile1) if ($tmpfile1);
-+	unlink($tmpfile2) if ($tmpfile2);
-+}
-+
-+
-+sub usage
-+{
-+	print ("Usage: mkknlimg [--dtok] [--283x] <vmlinux|zImage|bzImage> <outfile>\n");
-+	exit(1);
-+}
-+
-+sub try_extract
-+{
-+	my ($knl, $tmp) = @_;
-+
-+	my $ver = `strings "$knl" | grep -a -E "^Linux version [1-9]"`;
-+
-+	return undef if (!$ver);
-+
-+	chomp($ver);
-+
-+	my $res = { ''=>$ver };
-+	my $string_pattern = '^('.join('|', @wanted_strings).')$';
-+
-+	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;
-+}
-+
-+
-+sub try_decompress
-+{
-+	my ($magic, $subst, $zcat, $idx, $knl, $tmp1, $tmp2) = @_;
-+
-+	my $pos = `tr "$magic\n$subst" "\n$subst=" < "$knl" | grep -abo "^$subst"`;
-+	if ($pos)
-+	{
-+		chomp($pos);
-+		$pos = (split(/[\r\n]+/, $pos))[$idx];
-+		return undef if (!defined($pos));
-+		$pos =~ s/:.*[\r\n]*$//s;
-+		my $cmd = "tail -c+$pos \"$knl\" | $zcat > $tmp2 2> /dev/null";
-+		my $err = (system($cmd) >> 8);
-+		return undef if (($err != 0) && ($err != 2));
-+
-+		return try_extract($tmp2, $tmp1);
-+	}
-+
-+	return undef;
-+}
-+
-+sub pack_trailer
-+{
-+	my ($atoms) = @_;
-+	my $trailer = pack('VV', 0, 0);
-+	for (my $i = $#$atoms; $i>=0; $i--)
-+	{
-+		my $atom = $atoms->[$i];
-+		$trailer .= pack('a*x!4Va4', $atom->[1], length($atom->[1]), $atom->[0]);
-+	}
-+	return $trailer;
-+}
-+
-+sub config_bool
-+{
-+	my ($configs, $wanted) = @_;
-+	my $val = $configs->{$wanted} || 'n';
-+	return (($val eq 'y') || ($val eq '1'));
-+}