From 9dd3613073aa2491cef440725fdfa0cf1e8f1a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 17 Nov 2009 09:46:56 -0500 Subject: Drop shared-core, bsd-core, linux-core and scripts subdirs --- scripts/create_bsd_pci_lists.sh | 40 ------ scripts/create_linux_pci_lists.sh | 40 ------ scripts/create_lk_drm.sh | 37 ------ scripts/create_lk_gpu.sh | 58 --------- scripts/drm-scripts-gentree.pl | 254 -------------------------------------- 5 files changed, 429 deletions(-) delete mode 100644 scripts/create_bsd_pci_lists.sh delete mode 100644 scripts/create_linux_pci_lists.sh delete mode 100755 scripts/create_lk_drm.sh delete mode 100755 scripts/create_lk_gpu.sh delete mode 100755 scripts/drm-scripts-gentree.pl (limited to 'scripts') diff --git a/scripts/create_bsd_pci_lists.sh b/scripts/create_bsd_pci_lists.sh deleted file mode 100644 index 64a1fcb4..00000000 --- a/scripts/create_bsd_pci_lists.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Script to output BSD compatible pci ids file -# - Copyright Dave Airlie 2004 (airlied@linux.ie) -# -OUTFILE=drm_pciids.h - -finished=0 - -cat > $OUTFILE <> $OUTFILE - echo >> $OUTFILE - fi - else - - cardtype=`echo "$pcivend" | cut -s -f2 -d'[' | cut -s -f1 -d']'` - if [ "x$cardtype" = "x" ]; - then - echo " {$pcivend, $pcidev, $attribs, $pciname}, \\" >> $OUTFILE - else - echo "#define "$cardtype"_PCI_IDS \\" >> $OUTFILE - finished=0 - fi - fi -done - -if [ "$finished" = "0" ]; then - echo " {0, 0, 0, NULL}" >> $OUTFILE -fi diff --git a/scripts/create_linux_pci_lists.sh b/scripts/create_linux_pci_lists.sh deleted file mode 100644 index bb0e6878..00000000 --- a/scripts/create_linux_pci_lists.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/bash -# -# Script to output Linux compatible pci ids file -# - Copyright Dave Airlie 2004 (airlied@linux.ie) -# -OUTFILE=drm_pciids.h - -finished=0 - -cat > $OUTFILE <> $OUTFILE - echo >> $OUTFILE - fi - else - - cardtype=`echo "$pcivend" | cut -s -f2 -d'[' | cut -s -f1 -d']'` - if [ "x$cardtype" = "x" ]; - then - echo " {$pcivend, $pcidev, PCI_ANY_ID, PCI_ANY_ID, 0, 0, $attribs}, \\" >> $OUTFILE - else - echo "#define "$cardtype"_PCI_IDS \\" >> $OUTFILE - finished=0 - fi - fi -done - -if [ "$finished" = "0" ]; then - echo " {0, 0, 0}" >> $OUTFILE -fi diff --git a/scripts/create_lk_drm.sh b/scripts/create_lk_drm.sh deleted file mode 100755 index b18a9514..00000000 --- a/scripts/create_lk_drm.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/bash -# script to create a Linux Kernel tree from the DRM tree for diffing etc.. -# -# Original author - Dave Airlie (C) 2004 - airlied@linux.ie -# kernel_version to remove below (e.g. 2.6.24) - -if [ $# -lt 2 ] ;then - echo usage: $0 output_dir kernel_version - exit 1 -fi - -if [ ! -d shared-core -o ! -d linux-core ] ;then - echo not in DRM toplevel - exit 1 -fi - -OUTDIR=$1/drivers/char/drm/ -KERNEL_VERS=$2 -echo "Copying kernel independent files" -mkdir -p $OUTDIR/.tmp - -( cd linux-core/ ; make drm_pciids.h ) -cp shared-core/*.[ch] $OUTDIR/.tmp -cp linux-core/*.[ch] $OUTDIR/.tmp -cp linux-core/Makefile.kernel $OUTDIR/.tmp/Makefile - -echo "Copying 2.6 Kernel files" -cp linux-core/Kconfig $OUTDIR/.tmp - -./scripts/drm-scripts-gentree.pl $KERNEL_VERS $OUTDIR/.tmp $OUTDIR -cd $OUTDIR - -rm -rf .tmp -rm via_ds.[ch] -rm sis_ds.[ch] - -cd - diff --git a/scripts/create_lk_gpu.sh b/scripts/create_lk_gpu.sh deleted file mode 100755 index 4b323f7f..00000000 --- a/scripts/create_lk_gpu.sh +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/bash -# script to create a Linux Kernel tree from the DRM tree for diffing etc.. -# -# Original author - Dave Airlie (C) 2004 - airlied@linux.ie -# kernel_version to remove below (e.g. 2.6.24) - -if [ $# -lt 2 ] ;then - echo usage: $0 output_dir kernel_version - exit 1 -fi - -if [ ! -d shared-core -o ! -d linux-core ] ;then - echo not in DRM toplevel - exit 1 -fi - -DRMDIR=$1/drivers/gpu/drm/ -HDRDIR=$1/include/drm/ -KERNEL_VERS=$2 -echo "Copying kernel independent files" -mkdir -p $DRMDIR/.tmp -mkdir -p $HDRDIR/.tmp - -( cd linux-core/ ; make drm_pciids.h ) -cp shared-core/*.[ch] $DRMDIR/.tmp -cp linux-core/*.[ch] $DRMDIR/.tmp -cp linux-core/Makefile.kernel $DRMDIR/.tmp/Makefile - -echo "Copying 2.6 Kernel files" -cp linux-core/Kconfig $DRMDIR/.tmp - -./scripts/drm-scripts-gentree.pl $KERNEL_VERS $DRMDIR/.tmp $DRMDIR -mv $DRMDIR/drm*.h $HDRDIR -mv $DRMDIR/*_drm.h $HDRDIR - -cd $DRMDIR -rm -rf .tmp -rm via_ds.[ch] -rm sis_ds.[ch] -rm amd*.[ch] -rm radeon_ms*.[ch] - -for i in radeon mach64 r128 mga i915 i810 via savage sis xgi nouveau tdfx ffb imagine -do -mkdir ./$i -mv $i*.[ch] $i/ -done - -mv r300*.[ch] radeon/ -mv r600*.[ch] radeon/ -mv ObjectID.h radeon/ -mv atom*.[ch] radeon/ - -mv nv*.[ch] nouveau/ -mv intel*.[ch] i915/ -mv dvo*.[ch] i915/ - -cd - diff --git a/scripts/drm-scripts-gentree.pl b/scripts/drm-scripts-gentree.pl deleted file mode 100755 index cbc10175..00000000 --- a/scripts/drm-scripts-gentree.pl +++ /dev/null @@ -1,254 +0,0 @@ -#!/usr/bin/perl -# -# Original version were part of Gerd Knorr's v4l scripts. -# -# Several improvements by (c) 2005-2007 Mauro Carvalho Chehab -# -# Largely re-written (C) 2007 Trent Piepho -# Stolen for DRM usage by airlied -# -# Theory of Operation -# -# This acts as a sort of mini version of cpp, which will process -# #if/#elif/#ifdef/etc directives to strip out code used to support -# multiple kernel versions or otherwise not wanted to be sent upstream to -# git. -# -# Conditional compilation directives fall into two catagories, -# "processed" and "other". The "other" directives are ignored and simply -# output as they come in without changes (see 'keep' exception). The -# "processed" variaty are evaluated and only the lines in the 'true' part -# are kept, like cpp would do. -# -# If gentree knows the result of an expression, that directive will be -# "processed", otherwise it will be an "other". gentree knows the value -# of LINUX_VERSION_CODE, BTTV_VERSION_CODE, the KERNEL_VERSION(x,y,z) -# macro, numeric constants like 0 and 1, and a few defines like MM_KERNEL -# and STV0297_CS2. -# -# An exception is if the comment "/*KEEP*/" appears after the expression, -# in which case that directive will be considered an "other" and not -# processed, other than to remove the keep comment. -# -# Known bugs: -# don't specify the root directory e.g. '/' or even '////' -# directives continued with a back-slash will always be ignored -# you can't modify a source tree in-place, i.e. source dir == dest dir - -use strict; -use File::Find; -use Fcntl ':mode'; - -my $VERSION = shift; -my $SRC = shift; -my $DESTDIR = shift; - -if (!defined($DESTDIR)) { - print "Usage:\ngentree.pl\t \n\n"; - exit; -} - -my $BTTVCODE = KERNEL_VERSION(0,9,17); -my ($LINUXCODE, $extra) = kernel_version($VERSION); -my $DEBUG = 0; - -my %defs = ( - 'LINUX_VERSION_CODE' => $LINUXCODE, - 'MM_KERNEL' => ($extra =~ /-mm/)?1:0, - 'DRM_ODD_MM_COMPAT' => 0, - 'I915_HAVE_FENCE' => 1, - 'I915_HAVE_BUFFER' => 1, - 'VIA_HAVE_DMABLIT' => 1, - 'VIA_HAVE_CORE_MM' => 1, - 'VIA_HAVE_FENCE' => 1, - 'VIA_HAVE_BUFFER' => 1, - 'SIS_HAVE_CORE_MM' => 1, - 'DRM_FULL_MM_COMPAT' => 1, - '__linux__' => 1, -); - -################################################################# -# helpers - -sub kernel_version($) { - $_[0] =~ m/(\d+)\.(\d+)\.(\d+)(.*)/; - return ($1*65536 + $2*256 + $3, $4); -} - -# used in eval() -sub KERNEL_VERSION($$$) { return $_[0]*65536 + $_[1]*256 + $_[2]; } - -sub evalexp($) { - local $_ = shift; - s|/\*.*?\*/||go; # delete /* */ comments - s|//.*$||o; # delete // comments - s/\bdefined\s*\(/(/go; # defined(foo) to (foo) - while (/\b([_A-Za-z]\w*)\b/go) { - if (exists $defs{$1}) { - my $id = $1; my $pos = $-[0]; - s/$id/$defs{$id}/; - pos = $-[0]; - } elsif ($1 ne 'KERNEL_VERSION') { - return(undef); - } - } - return(eval($_) ? 1 : 0); -} - -################################################################# -# filter out version-specific code - -sub filter_source ($$) { - my ($in,$out) = @_; - my $line; - my $level=0; - my %if = (); - my %state = (); - - my @dbgargs = \($level, %state, %if, $line); - sub dbgline($\@) { - my $level = ${$_[1][0]}; - printf STDERR ("/* BP %4d $_[0] state=$_[1][1]->{$level} if=$_[1][2]->{$level} level=$level (${$_[1][3]}) */\n", $.) if $DEBUG; - } - - open IN, '<', $in or die "Error opening $in: $!\n"; - open OUT, '>', $out or die "Error opening $out: $!\n"; - - print STDERR "File: $in, for kernel $VERSION($LINUXCODE)/\n" if $DEBUG; - - while ($line = ) { - chomp $line; - next if ($line =~ m/^#include \"compat.h\"/o); -# next if ($line =~ m/[\$]Id:/); - - # For "#if 0 /*KEEP*/;" the ; should be dropped too - if ($line =~ m@^\s*#\s*if(n?def)?\s.*?(\s*/\*\s*(?i)keep\s*\*/;?)@) { - $state{$level} = "ifother"; - $if{$level} = 1; - dbgline "#if$1 (keep)", @dbgargs; - $line =~ s/\Q$2\E//; - $level++; - } - # handle all ifdef/ifndef lines - elsif ($line =~ /^\s*#\s*if(n?)def\s*(\w+)/o) { - if (exists $defs{$2}) { - $state{$level} = 'if'; - $if{$level} = ($1 eq 'n') ? !$defs{$2} : $defs{$2}; - dbgline "#if$1def $2", @dbgargs; - $level++; - next; - } - $state{$level} = "ifother"; - $if{$level} = 1; - dbgline "#if$1def (other)", @dbgargs; - $level++; - } - # handle all ifs - elsif ($line =~ /^\s*#\s*if\s+(.*)$/o) { - my $res = evalexp($1); - if (defined $res) { - $state{$level} = 'if'; - $if{$level} = $res; - dbgline '#if '.($res?'(yes)':'(no)'), @dbgargs; - $level++; - next; - } else { - $state{$level} = 'ifother'; - $if{$level} = 1; - dbgline '#if (other)', @dbgargs; - $level++; - } - } - # handle all elifs - elsif ($line =~ /^\s*#\s*elif\s+(.*)$/o) { - my $exp = $1; - $level--; - $level < 0 and die "more elifs than ifs"; - $state{$level} =~ /if/ or die "unmatched elif"; - - if ($state{$level} eq 'if' && !$if{$level}) { - my $res = evalexp($exp); - defined $res or die 'moving from if to ifother'; - $state{$level} = 'if'; - $if{$level} = $res; - dbgline '#elif1 '.($res?'(yes)':'(no)'), @dbgargs; - $level++; - next; - } elsif ($state{$level} ne 'ifother') { - $if{$level} = 0; - $state{$level} = 'elif'; - dbgline '#elif0', @dbgargs; - $level++; - next; - } - $level++; - } - elsif ($line =~ /^\s*#\s*else/o) { - $level--; - $level < 0 and die "more elses than ifs"; - $state{$level} =~ /if/ or die "unmatched else"; - $if{$level} = !$if{$level} if ($state{$level} eq 'if'); - $state{$level} =~ s/^if/else/o; # if -> else, ifother -> elseother, elif -> elif - dbgline '#else', @dbgargs; - $level++; - next if $state{$level-1} !~ /other$/o; - } - elsif ($line =~ /^\s*#\s*endif/o) { - $level--; - $level < 0 and die "more endifs than ifs"; - dbgline '#endif', @dbgargs; - next if $state{$level} !~ /other$/o; - } - - my $print = 1; - for (my $i=0;$i<$level;$i++) { - next if $state{$i} =~ /other$/o; # keep code in ifother/elseother blocks - if (!$if{$i}) { - $print = 0; - dbgline 'DEL', @{[\$i, \%state, \%if, \$line]}; - last; - } - } - print OUT "$line\n" if $print; - } - close IN; - close OUT; -} - -################################################################# - -sub parse_dir { - my $file = $File::Find::name; - - return if ($file =~ /CVS/); - return if ($file =~ /~$/); - - my $f2 = $file; - $f2 =~ s/^\Q$SRC\E/$DESTDIR/; - - my $mode = (stat($file))[2]; - if ($mode & S_IFDIR) { - print("mkdir -p '$f2'\n"); - system("mkdir -p '$f2'"); # should check for error - return; - } - print "from $file to $f2\n"; - - if ($file =~ m/.*\.[ch]$/) { - filter_source($file, $f2); - } else { - system("cp $file $f2"); - } -} - - -# main - -printf "kernel is %s (0x%x)\n",$VERSION,$LINUXCODE; - -# remove any trailing slashes from dir names. don't pass in just '/' -$SRC =~ s|/*$||; $DESTDIR =~ s|/*$||; - -print "finding files at $SRC\n"; - -find({wanted => \&parse_dir, no_chdir => 1}, $SRC); -- cgit v1.2.3