target/device: misc cleanup

Remove outdated and/or unused variables/files.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

Config.in

@@ -181,13 +181,11 @@ choice
 
 config BR2_OPTIMIZE_0
 	bool "optimization level 0"
-	depends on !BR2_PACKAGE_LINUX
 	help
 	  Do not optimize. This is the default.
 
 config BR2_OPTIMIZE_1
 	bool "optimization level 1"
-	depends on !BR2_PACKAGE_LINUX
 	help
 	  Optimize. Optimizing compilation takes somewhat more time,
 	  and a lot more memory for a large function. With -O, the

docs/buildroot.html

@@ -300,8 +300,6 @@ or
     internal toolchain is being built</li>
     <li><code>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</code>, path
     to the Busybox configuration file</li>
-    <li><code>LINUX26_KCONFIG=&lt;path/to/.config&gt;</code>, path
-    to the Linux kernel configuration file</li>
     <li><code>BUILDROOT_DL_DIR</code> to override the directory in
     which Buildroot stores/retrieves downloaded files</li>
     </ul>

target/device/ARMLTD/Makefile.in

@@ -1,9 +1,5 @@
 ifeq ($(BR2_TARGET_ARMLTD),y)
 BOARD_NAME=$(call qstrip,$(BR2_BOARD_NAME))
 BOARD_PATH=$(call qstrip,$(BR2_BOARD_PATH))
-
-
-# pin some settings
-BR2_GNU_TARGET_SUFFIX:="linux-uclibcgnueabi"
 endif
 

target/device/Atmel/Config.in.linux.patches

@@ -1,6 +0,0 @@
-if BR2_arm
-source "target/device/Atmel/arch-arm/Config.in.linux.patches"
-endif
-if BR2_avr32
-source "target/device/Atmel/arch-avr32/Config.in.linux.patches"
-endif

target/device/Atmel/Makefile.in

@@ -14,61 +14,7 @@ ifeq ($(BR2_avr32),y)
 KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2
 endif
 
-# These are set by Config.in
-DOWNLOAD_LINUX26_VERSION:= $(call qstrip,$(BR2_DOWNLOAD_LINUX26_VERSION))
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-LINUX26_VERSION:=$(call qstrip,$(BR2_LINUX26_VERSION))
-ifeq ($(LINUX26_VERSION),)
-LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-LINUX26_RC_PATCH:=$(call qstrip,$(BR2_LINUX26_RC_PATCH))
-
-# These are set by "new" Config.in
-LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config
-
-# This should be part of target/linux/Makefile.in
-LINUX26_BUILD_DIR:=$(BUILD_DIR)
-
-#LINUX26_BINLOC=$(LINUX26_FORMAT)
-#LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL)
-ifeq ($(BR2_avr32),y)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT)
-endif
-
-LINUX26_COPYTO:=/tftpboot
-
-#LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches
-
-# The board specific Makefile.in can redefine BOARD_NAME's
-LINUX_BOARD_NAME:=$(BOARD_NAME)
-#UBOOT_BOARD_NAME:=$(BOARD_NAME)
-DFB_BOARD_NAME:=$(BOARD_NAME)
-
-#BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config
-
-U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
-
 # Update things in board specific makefiles
 include target/device/Atmel/*/Makefile.in
 
-# Needs to be AFTER board specific Makefiles
-
-UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
-UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
-
-atmel_status:
-	@echo BUILD_DIR=$(BUILD_DIR)
-	@echo BOARD_NAME=$(BOARD_NAME)
-	@echo BR2_BOARD_PATH=$(BR2_BOARD_PATH)
-	@echo BR2_MAJOR_MINOR=$(BR2_LINUX_MAJOR_VERSION)$(BR2_LINUX_MINOR_VERSION)
-	@echo MAJOR_MINOR=$(LINUX_MAJOR_VER)$(LINUX_MINOR_VER)
-	@echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
-	@echo LINUX_SOURCE=$(LINUX_SOURCE)
-	@echo TARGETS=$(TARGETS)
-
-#TARGETS+=atmel_status
 endif

target/device/Atmel/arch-arm/Config.in.linux.patches

@@ -1,38 +0,0 @@
-choice
-	prompt "Add AT91 specific patches"
-	depends on BR2_KERNEL_ARCH_PATCH_ENABLED
-	depends on BR2_TARGET_ATMEL && BR2_arm
-	default BR2_ARCH_AT91_2_6_30		if BR2_LINUX_2_6_30
-	default BR2_ARCH_AT91_2_6_28		if BR2_LINUX_2_6_28
-	default BR2_ARCH_AT91_2_6_27		if BR2_LINUX_2_6_27
-	help
-	  Select a patch to add to the Linux kernel
-
-config BR2_ARCH_AT91_2_6_30
-	bool "2.6.30"
-	help
-	  Apply the at91 linux-2.6.30 patches
-
-config	BR2_ARCH_AT91_2_6_28
-	bool "2.6.28"
-	help
-	  Apply the at91 linux-2.6.28 patches
-
-config	BR2_ARCH_AT91_2_6_27
-	bool "2.6.27"
-	help
-	  Apply the at91 linux-2.6.27 patches
-endchoice
-
-config	BR2_KERNEL_ARCH_PATCH_VERSION
-	string
-	depends on BR2_KERNEL_ARCH_PATCH_ENABLED
-	depends on BR2_TARGET_ATMEL && BR2_arm
-	default "2.6.30" if BR2_ARCH_AT91_2_6_30
-	default "2.6.28" if BR2_ARCH_AT91_2_6_28
-	default "2.6.27" if BR2_ARCH_AT91_2_6_27
-
-config	BR2_KERNEL_ARCH_PATCH_DIR
-	string
-	default "target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
-

target/device/Atmel/arch-avr32/Config.in.linux.patches

@@ -1,33 +0,0 @@
-choice
-	prompt "Add AVR32 specific patches"
-	depends on BR2_KERNEL_ARCH_PATCH_ENABLED
-	depends on BR2_avr32
-	default BR2_ARCH_AVR32_2_6_27_6		if BR2_LINUX_2_6_27_6
-	default BR2_ARCH_AVR32_2_6_28_2
-	help
-	  Select a patch to add to the Linux kernel
-
-config	BR2_ARCH_AVR32_2_6_28_2
-	bool "2.6.28.2 (experimental)"
-	help
-	  Apply the avr32 linux-2.6.28.2 patches
-
-config	BR2_ARCH_AVR32_2_6_27_6
-	bool "2.6.27.6"
-	help
-	  Apply the avr32 linux-2.6.27.6 patches
-
-endchoice
-
-config	BR2_KERNEL_ARCH_PATCH_VERSION
-	string
-	depends on BR2_KERNEL_ARCH_PATCH_ENABLED
-	depends on BR2_avr32
-	default "2.6.28.2"	if BR2_ARCH_AVR32_2_6_28_2
-	default "2.6.27.6"	if BR2_ARCH_AVR32_2_6_27_6
-
-config	BR2_KERNEL_ARCH_PATCH_DIR
-	string
-	default "target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
-
-

target/device/Atmel/arch-avr32/arch-avr32.mk

@@ -1,27 +1,3 @@
 ifeq ($(BR2_avr32),y)
 
-avr32.patched.ac97: $(LINUX26_DIR)/.patched.ac97
-	@echo avr32.patched.ac97
-
-avr32.patched.isi: $(LINUX26_DIR)/.patched.isi
-	@echo avr32.patched.isi
-
-avr32.patched.psif: $(LINUX26_DIR)/.patched.psif
-	@echo avr32.patched.psif
-
-
-$(LINUX26_DIR)/.patched.isi: $(LINUX26_DIR)/.patched.arch
-	toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
-		linux-*-500-v4l-avr32-isi.patch.cond
-	touch $@
-
-$(LINUX26_DIR)/.patched.ac97: $(LINUX26_DIR)/.patched.arch
-	toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
-		linux-*-avr32-ac97-reset.patch.cond
-	touch $@
-
-$(LINUX26_DIR)/.patched.psif: $(LINUX26_DIR)/.patched.arch
-	toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
-		linux-*-avr32-psif-2.patch.cond
-	touch $@
 endif

target/device/Config.in.linux.patches

@@ -1,13 +0,0 @@
-menuconfig BR2_KERNEL_ARCH_PATCH_ENABLED
-	bool "Add ARCH specific patch"
-	depends on BR2_PACKAGE_LINUX
-	depends on !BR2_KERNEL_PREPATCHED
-	default y if BR2_avr32
-	default y if BR2_TARGET_ATMEL && BR2_arm
-
-if BR2_KERNEL_ARCH_PATCH_ENABLED
-
-source "target/device/Atmel/Config.in.linux.patches"
-
-endif
-

target/device/KwikByte/Makefile.in

@@ -3,48 +3,8 @@ ifeq ($(BR2_TARGET_KWIKBYTE),y)
 BOARD_NAME:=$(call qstrip,$(BR2_BOARD_NAME))
 BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
 
-# These are set by Config.in
-DOWNLOAD_LINUX26_VERSION:=$(call qstrip,$(BR2_DOWNLOAD_LINUX26_VERSION))
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-LINUX26_VERSION:=$(call qstrip,$(BR2_LINUX26_VERSION))
-ifeq ($(LINUX26_VERSION),)
-LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-# These are set by "new" Config.in
-ifeq ($(BR2_LINUX26_KCONFIG),)
-LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux.config
-endif
-
-# This should be part of target/linux/Makefile.in
-LINUX26_BUILD_DIR:=$(BUILD_DIR)
-
-LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
-
-LINUX26_COPYTO:=/tftpboot
-
-#LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches
-
-# The board specific Makefile.in can redefine BOARD_NAME's
-LINUX_BOARD_NAME:=$(BOARD_NAME)
-
 ifeq ($(BR2_TARGET_KB9202),y)
 include target/device/KwikByte/kb9202/Makefile.in
 endif
 
-# Needs to be AFTER board specific Makefiles
-
-kwikbyte_status:
-	@echo BUILD_DIR=$(BUILD_DIR)
-	@echo BOARD_NAME=$(BOARD_NAME)
-	@echo BR2_BOARD_PATH=$(BR2_BOARD_PATH)
-	@echo MAJOR_MINOR=$(LINUX_MAJOR_VER)$(LINUX_MINOR_VER)
-	@echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
-	@echo LINUX_SOURCE=$(LINUX_SOURCE)
-	@echo TARGETS=$(TARGETS)
-	@echo LINUX26_BINLOC=$(LINUX26_BINLOC)
-
 endif

target/device/Makefile.in

@@ -1,8 +1,2 @@
-TARGET_DEVICE_DEPMOD:=target/device/x86/depmod.pl
-
 -include target/device/*/Makefile.in
 
-ifeq ($(BR2_PACKAGE_LINUX),y)
-TARGETS+=linux26
-endif
-

target/device/mips/Makefile.in

@@ -1,26 +1,4 @@
 ifneq ($(findstring y,$(BR2_mips)$(BR2_mipsel)),)
 BR2_BOARD_PATH:=target/device/mips
 BOARD_PATH:=target/device/mips
-
-
-ifeq ($(strip $(BR2_PACKAGE_LINUX_KCONFIG)),)
-ifndef LINUX26_KCONFIG
-LINUX26_KCONFIG=$(BOARD_PATH)/linux26.config
-endif
-else
-LINUX26_KCONFIG=$(strip $(BR2_PACKAGE_LINUX_KCONFIG))
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_LINUX_FORMAT)),)
-ifndef LINUX26_FORMAT
-LINUX26_FORMAT=vmlinux
-endif
-else
-LINUX26_FORMAT=$(strip $(BR2_PACKAGE_LINUX_FORMAT))
-endif
-
-ifndef LINUX26_BINLOC
-# mips32 has the vmlinux in the toplevel kernel build-tree.
-LINUX26_BINLOC=$(LINUX26_FORMAT)
-endif
 endif

target/device/valka/Makefile.in

@@ -3,14 +3,4 @@ VALKA_PATH= target/device/valka
 
 TARGET_SKELETON=$(VALKA_PATH)/target_skeleton
 KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2
-
-valka_status:
-	@echo "***************************************************************"
-	@echo VALKA_PATH = $(VALKA_PATH)
-	@echo BOARD_NAME = $(BR_BOARD_NAME)
-	@echo TARGET_SKELETON = $(TARGET_SKELETON)
-	@echo BR2_PACKAGE_BUSYBOX_CONFIG = $(BR2_PACKAGE_BUSYBOX_CONFIG)
-	@echo BR2_PACKAGE_LINUX_KCONFIG = $(BR2_PACKAGE_LINUX_KCONFIG)
-	@echo "*****************************************************************"
-	@echo TARGETS = $(TARGETS)
 endif

target/device/x86/depmod.pl

@@ -1,237 +0,0 @@
-#!/usr/bin/perl -w
-# vi: set ts=4:
-# Copyright (c) 2001 David Schleef <ds@schleef.org>
-# Copyright (c) 2001 Erik Andersen <andersen@codepoet.org>
-# Copyright (c) 2001 Stuart Hughes <stuarth@lineo.com>
-# Copyright (c) 2002 Steven J. Hill <shill@broadcom.com>
-# This program is free software; you can redistribute it and/or modify it
-# under the same terms as Perl itself.
-
-# TODO -- use strict mode...
-#use strict;
-
-use Getopt::Long;
-use File::Find;
-
-
-# Set up some default values
-
-my $basedir="";
-my $kernel;
-my $kernelsyms;
-my $stdout=0;
-my $verbose=0;
-
-
-# get command-line options
-
-my %opt;
-
-GetOptions(
-	\%opt,
-	"help|h",
-	"basedir|b=s" => \$basedir,
-	"kernel|k=s" => \$kernel,
-	"kernelsyms|F=s" => \$kernelsyms,
-	"stdout|n" => \$stdout,
-	"verbose|v" => \$verbose,
-);
-
-if (defined $opt{help}) {
-	print
-	"  $0 [OPTION]... [basedir]\n",
-	"     -h --help\t\tShow this help screen\n",
-	"     -b --basedir\tModules base directory (defaults to /lib/modules)\n",
-	"     -k --kernel\tKernel binary for the target\n",
-	"     -F --kernelsyms\tKernel symbol file\n",
-	"     -n --stdout\tWrite to stdout instead of <basedir>/modules.dep\n",
-	"     -v --verbose\tPrint out lots of debugging stuff\n",
-	;
-	exit 1;
-}
-
-if($basedir !~ m-/lib/modules-) {
-    warn "WARNING: base directory does not match ..../lib/modules\n";
-}
-
-# Find the list of .o files living under $basedir
-#if ($verbose) { printf "Locating all modules\n"; }
-my($ofile) = "";
-my($file) = "";
-my(@liblist) = ();
-find sub {
-	if ( -f $_  && ! -d $_ ) {
-		$file = $File::Find::name;
-		if ( $file =~ /.o$/ ) {
-			push(@liblist, $file);
-			if ($verbose) { printf "$file\n"; }
-		}
-	}
-}, $basedir;
-if ($verbose) { printf "Finished locating modules\n"; }
-
-foreach $obj ( @liblist, $kernel ){
-    # turn the input file name into a target tag name
-    # vmlinux is a special that is only used to resolve symbols
-    if($obj =~ /vmlinux/) {
-        $tgtname = "vmlinux";
-    } else {
-        ($tgtname) = $obj =~ m-(/lib/modules/.*)$-;
-    }
-
-    warn "MODULE = $tgtname\n" if $verbose;
-
-    # get a list of symbols
-	@output=`nm $obj`;
-	$ksymtab=grep m/ __ksymtab/, @output;
-
-    # gather the exported symbols
-	if($ksymtab){
-        # explicitly exported
-        foreach ( @output ) {
-            / __ksymtab_(.*)$/ and do {
-                warn "sym = $1\n" if $verbose;
-                $exp->{$1} = $tgtname;
-            };
-        }
-	} else {
-        # exporting all symbols
-        foreach ( @output) {
-            / [ABCDGRST] (.*)$/ and do {
-                warn "syma = $1\n" if $verbose;
-                $exp->{$1} = $tgtname;
-            };
-        }
-	}
-    # gather the unresolved symbols
-    foreach ( @output ) {
-        !/ __this_module/ && / U (.*)$/ and do {
-            warn "und = $1\n" if $verbose;
-            push @{$dep->{$tgtname}}, $1;
-        };
-    }
-}
-
-
-# reduce dependancies: remove unresolvable and resolved from vmlinux
-# remove duplicates
-foreach $module (keys %$dep) {
-    $mod->{$module} = {};
-    foreach (@{$dep->{$module}}) {
-        if( $exp->{$_} ) {
-            warn "resolved symbol $_ in file $exp->{$_}\n" if $verbose;
-            next if $exp->{$_} =~ /vmlinux/;
-            $mod->{$module}{$exp->{$_}} = 1;
-        } else {
-            warn "unresolved symbol $_ in file $module\n";
-        }
-    }
-}
-
-# resolve the dependancies for each module
-if ($stdout == 1) {
-	foreach $module ( keys %$mod ) {
-		print "$module:\t";
-		@sorted = sort bydep keys %{$mod->{$module}};
-		print join(" \\\n\t",@sorted);
-		print "\n\n";
-	}
-} else {
-	open(OFILE, ">$basedir/modules.dep");
-	foreach $module ( keys %$mod ) {
-		print OFILE "$module:\t";
-		@sorted = sort bydep keys %{$mod->{$module}};
-		print OFILE join(" \\\n\t",@sorted);
-		print OFILE "\n\n";
-	}
-}
-
-
-sub bydep
-{
-    foreach my $f ( keys %{$mod->{$b}} ) {
-        if($f eq $a) {
-            return 1;
-        }
-    }
-    return -1;
-}
-
-
-
-__END__
-
-=head1 NAME
-
-depmod.pl - a cross platform script to generate kernel module dependency
-		lists which can then be used by modprobe.
-
-=head1 SYNOPSIS
-
-depmod.pl [OPTION]... [basedir]...
-
-Example:
-
-	depmod.pl -F linux/System.map target/lib/modules
-
-=head1 DESCRIPTION
-
-The purpose of this script is to automagically generate a list of of kernel
-module dependancies.  This script produces dependancy lists that should be
-identical to the depmod program from the modutils package.  Unlike the depmod
-binary, however, depmod.pl is designed to be run on your host system, not
-on your target system.
-
-This script was written by David Schleef <ds@schleef.org> to be used in
-conjunction with the BusyBox modprobe applet.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<-h --help>
-
-This displays the help message.
-
-=item B<-b --basedir>
-
-The base directory uner which the target's modules will be found.  This
-defaults to the /lib/modules directory.
-
-=item B<-k --kernel>
-
-Kernel binary for the target.  You must either supply a kernel binary
-or a kernel symbol file (using the -F option).
-
-=item B<-F --kernelsyms>
-
-Kernel symbol file for the target.  You must supply either a kernel symbol file
-kernel binary for the target (using the -k option).
-
-=item B<-n --stdout>
-
-Write to stdout instead of modules.dep.  This is currently hard coded...
-kernel binary for the target (using the -k option).
-
-=item B<--verbose>
-
-Be verbose (not implemented)
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright (c) 2001 David Schleef <ds@schleef.org>
-Copyright (c) 2001 Erik Andersen <andersen@codepoet.org>
-Copyright (c) 2001 Stuart Hughes <stuarth@lineo.com>
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-=head1 AUTHOR
-
-David Schleef <ds@schleef.org>
-
-=cut
-
-# $Id: depmod.pl,v 1.1 2004/12/08 01:34:41 andersen Exp $
-

target/device/x86/i686/Makefile.in

@@ -1,15 +1,3 @@
 BOARD_NAME=$(call qstrip,$(BR2_BOARD_NAME))
 BOARD_PATH=$(call qstrip,$(BR2_BOARD_PATH))
 
-
-
-ifeq ($(strip $(BR2_PACKAGE_LINUX_FORMAT)),)
-ifndef LINUX26_FORMAT
-LINUX26_FORMAT=bzImage
-endif
-else
-LINUX26_FORMAT=$(strip $(BR2_PACKAGE_LINUX_FORMAT))
-endif
-
-KERNEL_HEADERS_PATCH_DIR:=$(BOARD_PATH)/kernel-header-patches
-

target/device/xtensa/Makefile.in

@@ -1,8 +1,6 @@
 ifeq ($(BR2_xtensa),y)
 
 ifeq ($(strip $(BR2_TARGET_XTENSA_XTAV60)),y)
-# UCLIBC_CONFIG_FILE:=target/device/xtensa/xtav60/uClibc.config
-# BR2_PACKAGE_BUSYBOX_CONFIG:=target/device/xtensa/xtav60/busybox.config
 TARGET_SKELETON_PATCH:=target/device/xtensa
 endif