Create Advanced Linux Configuration option/Remove experimental

author: Ulf Samuelsson 2007-10-13 20:30:28 +0200
committer: Ulf Samuelsson 2007-10-13 20:30:28 +0200
commit: 453dca995ee437b2f6fc3e0a6e4e2b4317346dae (patch)
tree: cb581b1c418560e1a8c0a062f09f6b2df8e82911
parent: Update AVR32 toolchain with new binutils and uClibc, This time it works (cros... (diff)
download: buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.tar.gz
buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.tar.xz
buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.zip
9 files changed, 1570 insertions, 899 deletions
diff --git a/target/Config.in b/target/Config.in
index 2ca190c9c..a9a40e4d3 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -23,26 +23,52 @@ endmenu
 menu "Kernel"
 choice
 	prompt "Kernel type"
-	default BR2_KERNEL_LINUX
+	default BR2_KERNEL_LINUX_ADVANCED if BR2_TARGET_ATMEL
+	default BR2_KERNEL_LINUX if !BR2_TARGET_ATMEL
 
 config BR2_KERNEL_none
 	bool "none"
 	help
 	  Do not build a kernel
 
+config BR2_KERNEL_LINUX_ADVANCED
+	bool "linux (Advanced configuration)"
+	select BR2_PACKAGE_LINUX
+	help
+	  The Linux kernel - Advanced Configuration.
+	  http://www.kernel.org/
+
+	  Note: Requires kernel-headers >= 2.6.19 since the other
+	        kernel headers are just that (headers) and not full
+	        kernels. This is a feature.
+
 config BR2_KERNEL_LINUX
-	bool "linux"
+	bool "linux (Same version as linux headers)"
+	select BR2_PACKAGE_LINUX
 	help
-	  Linux kernel
+	  The Linux kernel.
+	  http://www.kernel.org/
+
+	  Note: Requires kernel-headers >= 2.6.19 since the other
+	        kernel headers are just that (headers) and not full
+	        kernels. This is a feature.
 
 config BR2_KERNEL_HURD
 	bool "hurd"
 	help
 	  GNU/Hurd kernel
 endchoice
-if BR2_KERNEL_LINUX
+
+config BR2_PACKAGE_LINUX
+	bool
+	default n
+
+if BR2_PACKAGE_LINUX
 source "target/linux/Config.in"
+#source "target/linux/Config.in.experimental"
+source "target/linux/Config.in.advanced"
 endif
+
 if BR2_KERNEL_HURD
 source "target/hurd/Config.in"
 endif
diff --git a/target/Makefile.in b/target/Makefile.in
index bb7d596cc..b8e50577a 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -17,11 +17,14 @@ include target/*/*.mk
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.
 
-#ifeq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG))),y)
+ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX))),y)
 #"))
-#include target/linux/Makefile.in
-##include target/linux-experimental/Makefile.in
-#else
 include target/linux/Makefile.in
-#endif
+endif
+
+ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX_ADVANCED))),y)
+#"))
+include target/linux/Makefile.in.advanced
+endif
+
 include target/hurd/Makefile.in
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index dbc91d4fb..898e3985f 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -53,16 +53,15 @@ endif
 LINUX26_COPYTO:=/tftpboot
 
 ifeq ($(DEFAULT_KERNEL_HEADERS),2.6.22.1)
-KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(LINUX26_VERSION)
 else
 # Patch during kernel header build
 ifeq ($(BR2_avr32),y)
-KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(LINUX26_VERSION)
 endif
 # Patch during kernel build
 ifeq ($(BR2_arm),y)
-#LINUX26_PATCH_DIR:=target/device/Atmel/arch-at91/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
-KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-arm/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-arm/kernel-patches-$(LINUX26_VERSION)
 endif
 endif
 
@@ -73,7 +72,7 @@ DFB_BOARD_NAME:=$(BOARD_NAME)
 
 BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config
 
-LINUX26_KERNEL=$(BINARIES_DIR)/$(PROJECT)-linux-$(LINUX26_VERSION)
+LINUX26_KERNEL=$(BINARIES_DIR)/$(PROJECT)-linux-$(LINUX26_VERSION)-$(DATE)
 
 # Update things in board specific makefiles
 include target/device/Atmel/*/Makefile.in
@@ -99,19 +98,4 @@ ifeq ($(strip $(BR2_TARGET_AT91BOOTSTRAP)),y)
 include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk
 endif
 
-atmel_status:
-	@echo PROJECT_BUILD_DIR=$(PROJECT_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)
-	@echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR)
-	@echo LINUX26_BINLOC=$(LINUX26_BINLOC)
-	@echo LINUX26_FORMAT=$(LINUX26_FORMAT)
-	@echo LINUX26_KERNEL=$(LINUX26_KERNEL)
-
-#TARGETS+=atmel_status
 endif
diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
index 69afb804b..157ba29ce 100644
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
@@ -1,15 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Sat Jul 14 15:27:09 2007
+# Sat Oct 13 17:46:13 2007
 #
 BR2_HAVE_DOT_CONFIG=y
-
-#
-# Project Options
-#
-BR2_PROJECT="at91sam9260dfc"
-BR2_HOSTNAME="at91sam9260dfc"
-BR2_BANNER="Welcome to the Erik's uClibc development environment running on the AT91SAM9260EK"
+BR2_VERSION="0.10.0-svn"
 # BR2_alpha is not set
 BR2_arm=y
 # BR2_armeb is not set
@@ -26,14 +20,17 @@ BR2_arm=y
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
+# BR2_sparc64 is not set
 # BR2_x86_64 is not set
 BR2_generic_arm=y
+# BR2_arm7tdmi is not set
 # BR2_arm610 is not set
 # BR2_arm710 is not set
 # BR2_arm720t is not set
 # BR2_arm920t is not set
 # BR2_arm922t is not set
 # BR2_arm926t is not set
+# BR2_arm10t is not set
 # BR2_arm1136jf_s is not set
 # BR2_arm1176jz_s is not set
 # BR2_arm1176jzf_s is not set
@@ -42,38 +39,147 @@ BR2_generic_arm=y
 # BR2_xscale is not set
 # BR2_iwmmxt is not set
 BR2_ARM_TYPE="GENERIC_ARM"
-BR2_ARM_OABI=y
-# BR2_ARM_EABI is not set
+# BR2_ARM_OABI is not set
+BR2_ARM_EABI=y
 BR2_ARCH="arm"
 BR2_ENDIAN="LITTLE"
 
 #
+# Target options
+#
+
+#
+# Project Options
+#
+BR2_PROJECT="at91sam9260dfc"
+BR2_HOSTNAME="at91sam9260dfc"
+BR2_BANNER="Welcome to the Erik's uClibc development environment running on the AT91SAM9260EK"
+
+#
+# Preset Devices
+#
+# BR2_TARGET_ARM is not set
+BR2_TARGET_ATMEL=y
+
+#
+# Atmel AT91 Specific Device Support
+#
+BR2_TARGET_AT91=y
+# BR2_TARGET_AT91RM9200 is not set
+BR2_TARGET_AT91SAM9260=y
+# BR2_TARGET_AT91SAM9260A is not set
+# BR2_TARGET_AT91SAM9261 is not set
+# BR2_TARGET_AT91SAM9261S is not set
+# BR2_TARGET_AT91SAM9262 is not set
+# BR2_TARGET_AT91SAM9263 is not set
+# BR2_TARGET_AT91SAM9XE is not set
+# BR2_TARGET_AT91RM9200DF is not set
+# BR2_TARGET_AT91RM9200SE is not set
+# BR2_TARGET_AT91RM9200EK is not set
+# BR2_TARGET_AT91RM9200DK is not set
+BR2_TARGET_AT91SAM9260DFC=y
+# BR2_TARGET_AT91SAM9260EK is not set
+# BR2_TARGET_AT91SAM9260PF is not set
+# BR2_TARGET_AT91SAM9261EK is not set
+# BR2_TARGET_AT91SAM9262EK is not set
+# BR2_TARGET_AT91SAM9263EK is not set
+# BR2_TARGET_AT91SAM9XEEK is not set
+BR2_BOARD_NAME="at91sam9260dfc"
+BR2_TARGET_AT91_ADVANCED_INFO=y
+
+#
+# Package support
+#
+
+#
+# Secondary locations
+#
+BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6"
+BR2_TARGET_ATMEL_COPYTO="/tftpboot"
+BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
+BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
+BR2_TARGET_UBOOT_GATEWAY="10.175.196.1"
+BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
+BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
+BR2_TARGET_AT91BOOTSTRAP=y
+# BR2_TARGET_AT91BOOT_DATAFLASH is not set
+BR2_TARGET_AT91BOOT_DATAFLASHCARD=y
+# BR2_TARGET_AT91BOOT_NANDFLASH is not set
+# BR2_TARGET_AT91BOOT_FLASH is not set
+BR2_TARGET_AT91BOOTSTRAP_MEMORY="dataflashcard"
+BR2_AT91BOOTSTRAP_IMG_SIZE="0x32000"
+BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT=y
+# BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM is not set
+# BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM is not set
+BR2_AT91BOOTSTRAP_JUMP_ADDR="0x23F00000"
+
+#
+# It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)
+#
+# BR2_TARGET_SHARP is not set
+
+#
+# Generic System Support
+#
+# BR2_TARGET_GENERIC_ACCESS_POINT is not set
+# BR2_TARGET_GENERIC_FIREWALL is not set
+# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
+
+#
 # Build options
 #
 BR2_WGET="wget --passive-ftp -nd"
-BR2_SVN="svn co"
+BR2_SVN_CO="svn co"
+BR2_SVN_UP="svn up"
+BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="/usr/local/install/downloads"
+
+#
+# Mirrors and Download locations
+#
 BR2_SOURCEFORGE_MIRROR="easynews"
+
+#
+# Atmel Mirrors
+#
 BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="/usr/local/arm/gcc-4.2.0-uclibc-20070714"
+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
+BR2_ROOTFS_PREFIX="rootfs"
+BR2_ROOTFS_SUFFIX="$(DATE)"
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
+BR2_RECENT=y
+BR2_STRIP_strip=y
+# BR2_STRIP_sstrip is not set
+# BR2_STRIP_none is not set
 # BR2_PREFER_STATIC_LIB is not set
-BR2_TOOLCHAIN_BUILDROOT=y
-# BR2_TOOLCHAIN_EXTERNAL is not set
+# BR2_HAVE_MANPAGES is not set
+# BR2_HAVE_INFOPAGES is not set
+BR2_UPDATE_CONFIG=y
 
 #
-# Toolchain Options
+# Toolchain
 #
+BR2_TOOLCHAIN_BUILDROOT=y
+# BR2_TOOLCHAIN_EXTERNAL is not set
+# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
+BR2_TOOLCHAIN_SOURCE=y
+BR2_EXT_GCC_VERSION_4_1_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
+BR2_EXT_BINUTILS_VERSION_2_17=y
+BR2_EXT_UCLIBC_VERSION_0_9_29=y
+BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
 
 #
 # Kernel Header Options
@@ -85,15 +191,24 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_KERNEL_HEADERS_2_6_9 is not set
 # BR2_KERNEL_HEADERS_2_6_11 is not set
 # BR2_KERNEL_HEADERS_2_6_12 is not set
-# BR2_KERNEL_HEADERS_2_6_19_2 is not set
+# BR2_KERNEL_HEADERS_2_6_20_4 is not set
 # BR2_KERNEL_HEADERS_2_6_20 is not set
-BR2_KERNEL_HEADERS_2_6_21=y
-BR2_DEFAULT_KERNEL_HEADERS="2.6.21.5"
+# BR2_KERNEL_HEADERS_2_6_21_5 is not set
+# BR2_KERNEL_HEADERS_2_6_21 is not set
+BR2_KERNEL_HEADERS_2_6_22_1=y
+# BR2_KERNEL_HEADERS_2_6_22_10 is not set
+# BR2_KERNEL_HEADERS_2_6_22 is not set
+# BR2_KERNEL_HEADERS_2_6_23 is not set
+# BR2_KERNEL_HEADERS_SNAP is not set
+# BR2_KERNEL_HEADERS_IPMI is not set
+# BR2_KERNEL_HEADERS_LZMA is not set
+# BR2_KERNEL_HEADERS_RT is not set
+BR2_KERNEL_HEADERS_PATCH_DIR=y
+BR2_DEFAULT_KERNEL_HEADERS="2.6.22.1"
 
 #
 # uClibc Options
 #
-# BR2_UCLIBC_VERSION_0_9_28 is not set
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 BR2_UCLIBC_VERSION_0_9_29=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -104,60 +219,37 @@ BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
+BR2_UCLIBC_PROGRAM_INVOCATION=y
 
 #
 # Binutils Options
 #
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
-# BR2_BINUTILS_VERSION_2_16_1 is not set
-# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_7 is not set
-BR2_BINUTILS_VERSION_2_17=y
-# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_4 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_5 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_6 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_7 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_12 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_14 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_16 is not set
+# BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION="2.17"
+BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
+BR2_BINUTILS_VERSION="2.18"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_3_6 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-# BR2_GCC_VERSION_3_4_3 is not set
-# BR2_GCC_VERSION_3_4_4 is not set
-# BR2_GCC_VERSION_3_4_5 is not set
 # BR2_GCC_VERSION_3_4_6 is not set
-# BR2_GCC_VERSION_4_0_0 is not set
-# BR2_GCC_VERSION_4_0_1 is not set
-# BR2_GCC_VERSION_4_0_2 is not set
-# BR2_GCC_VERSION_4_0_3 is not set
 # BR2_GCC_VERSION_4_0_4 is not set
-# BR2_GCC_VERSION_4_1_0 is not set
-# BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
-BR2_GCC_VERSION_4_2_0=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 # BR2_GCC_IS_SNAP is not set
-BR2_GCC_VERSION="4.2.0"
+BR2_GCC_SUPPORTS_SYSROOT=y
+# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_INSTALL_LIBSTDCPP is not set
+BR2_GCC_CROSS_CXX=y
+# BR2_GCC_CROSS_FORTRAN is not set
+BR2_INSTALL_LIBSTDCPP=y
+# BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
 BR2_GCC_SHARED_LIBGCC=y
@@ -189,6 +281,7 @@ BR2_PACKAGE_SSTRIP_HOST=y
 BR2_LARGEFILE=y
 # BR2_INET_IPV6 is not set
 # BR2_INET_RPC is not set
+BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
@@ -196,23 +289,14 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 #
 # Package Selection for the target
 #
-
-#
-# The default minimal system
-#
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_0_1 is not set
-# BR2_BUSYBOX_VERSION_1_1_3 is not set
 # BR2_BUSYBOX_VERSION_1_2_2_1 is not set
-# BR2_BUSYBOX_VERSION_1_4_0 is not set
-# BR2_BUSYBOX_VERSION_1_4_1 is not set
-# BR2_BUSYBOX_VERSION_1_4_2 is not set
-# BR2_BUSYBOX_VERSION_1_5_0 is not set
-# BR2_BUSYBOX_VERSION_1_5_1 is not set
-# BR2_BUSYBOX_VERSION_1_6_0 is not set
-BR2_BUSYBOX_VERSION_1_6_1=y
+# BR2_BUSYBOX_VERSION_1_6_1 is not set
+# BR2_BUSYBOX_VERSION_1_7_0 is not set
+# BR2_BUSYBOX_VERSION_1_7_1 is not set
+BR2_BUSYBOX_VERSION_1_7_2=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.6.1"
+BR2_BUSYBOX_VERSION="1.7.2"
 BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
 # BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
@@ -230,7 +314,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
 # BR2_PACKAGE_FLEX is not set
 # BR2_PACKAGE_GAWK is not set
 # BR2_PACKAGE_GCC_TARGET is not set
-BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS=""
 # BR2_PACKAGE_GREP is not set
 # BR2_PACKAGE_MAKE is not set
 # BR2_PACKAGE_PATCH is not set
@@ -256,7 +339,6 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_LIBMPFR is not set
 # BR2_PACKAGE_LIBTOOL is not set
 # BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_MPATROL is not set
 # BR2_PACKAGE_PKGCONFIG is not set
 # BR2_READLINE is not set
 # BR2_PACKAGE_XERCES is not set
@@ -272,16 +354,20 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_KEXEC is not set
 # BR2_PACKAGE_LESS is not set
+BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
 # BR2_PACKAGE_LIBFLOAT is not set
+# BR2_PACKAGE_LIBGCRYPT is not set
+# BR2_PACKAGE_LIBGPG_ERROR is not set
 # BR2_PACKAGE_LIBLOCKFILE is not set
 # BR2_PACKAGE_LIBSYSFS is not set
+# BR2_PACKAGE_LIBXML2 is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
 # BR2_PACKAGE_LSOF is not set
 # BR2_PACKAGE_LTP-TESTSUITE is not set
+# BR2_PACKAGE_LTRACE is not set
 # BR2_PACKAGE_LTT is not set
-# BR2_PACKAGE_MICROCOM is not set
 # BR2_PACKAGE_MODULE_INIT_TOOLS is not set
 # BR2_PACKAGE_MODUTILS is not set
 # BR2_PACKAGE_NANO is not set
@@ -298,6 +384,10 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_UTIL-LINUX is not set
 # BR2_PACKAGE_WHICH is not set
 BR2_NETWORK_SUPPORT=y
+
+#
+# Networking applications
+#
 # BR2_PACKAGE_ARGUS is not set
 # BR2_PACKAGE_AVAHI is not set
 # BR2_PACKAGE_BOA is not set
@@ -310,7 +400,7 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
 # BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_HOSTAP is not set
+# BR2_PACKAGE_IRDA_UTILS is not set
 # BR2_PACKAGE_IPERF is not set
 # BR2_PACKAGE_IPROUTE2 is not set
 # BR2_PACKAGE_IPSEC_TOOLS is not set
@@ -319,10 +409,12 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_LIBCGI is not set
 # BR2_PACKAGE_LIBCGICC is not set
 # BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_LIGHTTPD is not set
 # BR2_PACKAGE_LINKS is not set
 # BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MDNSRESPONDER is not set
+# BR2_PACKAGE_MICROCOM is not set
 # BR2_PACKAGE_MROUTED is not set
+# BR2_PACKAGE_MUTT is not set
 # BR2_PACKAGE_NBD is not set
 # BR2_PACKAGE_NCFTP is not set
 # BR2_PACKAGE_NETCAT is not set
@@ -332,6 +424,7 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_NETSNMP is not set
 # BR2_PACKAGE_NFS_UTILS is not set
 # BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_OLSR is not set
 # BR2_PACKAGE_OPENNTPD is not set
 # BR2_PACKAGE_OPENSSH is not set
 # BR2_PACKAGE_OPENSSL is not set
@@ -339,6 +432,8 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_OPENSWAN is not set
 # BR2_PACKAGE_PORTMAP is not set
 # BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RP_PPPOE is not set
+# BR2_PACKAGE_PPTP_LINUX is not set
 # BR2_PACKAGE_PROFTPD is not set
 # BR2_PACKAGE_QUAGGA is not set
 
@@ -357,10 +452,14 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_SOCAT is not set
 # BR2_PACKAGE_STUNNEL is not set
 # BR2_PACKAGE_TCPDUMP is not set
+# BR2_PACKAGE_DHCPDUMP is not set
 # BR2_PACKAGE_TFTPD is not set
+# BR2_PACKAGE_LIGHTTPD is not set
 # BR2_PACKAGE_THTTPD is not set
+# BR2_PACKAGE_TINYHTTPD is not set
 # BR2_PACKAGE_TN5250 is not set
 # BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_VPNC is not set
 # BR2_PACKAGE_VTUN is not set
 # BR2_PACKAGE_WGET is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
@@ -369,20 +468,25 @@ BR2_BLOCKDEV_SUPPORT=y
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
 # BR2_PACKAGE_E2FSPROGS is not set
+# BR2_PACKAGE_GADGETFS_TEST is not set
 # BR2_PACKAGE_HAL is not set
 # BR2_PACKAGE_HDPARM is not set
 # BR2_PACKAGE_HOTPLUG is not set
 # BR2_PACKAGE_HWDATA is not set
 # BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_LIBAIO is not set
 # BR2_PACKAGE_LIBRAW1394 is not set
 # BR2_PACKAGE_LIBUSB is not set
+# BR2_PACKAGE_LM_SENSORS is not set
 # BR2_PACKAGE_LVM2 is not set
 # BR2_PACKAGE_MDADM is not set
 # BR2_PACKAGE_MEMTESTER is not set
 # BR2_PACKAGE_MKDOSFS is not set
 BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_EXPERIMENTAL=y
-BR2_PACKAGE_MTD_ORIG_STRING="mtd_20060107.orig.tar.gz"
+# BR2_PACKAGE_MTD_UTILS is not set
+BR2_PACKAGE_MTD_20061007=y
+# BR2_PACKAGE_MTD_20050122 is not set
+# BR2_PACKAGE_MTD_SNAPSHOT is not set
 
 #
 # MTD tools selection
@@ -419,11 +523,12 @@ BR2_PACKAGE_MTD_DOC_LOADBIOS=y
 # BR2_PACKAGE_WIPE is not set
 # BR2_PACKAGE_XFSPROGS is not set
 BR2_AUDIO_SUPPORT=y
+# BR2_PACKAGE_ALSA_LIB is not set
 # BR2_PACKAGE_ASTERISK is not set
 # BR2_PACKAGE_AUMIX is not set
-# BR2_PACKAGE_LIBID3TAG is not set
 # BR2_PACKAGE_LIBMAD is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBVORBIS is not set
 # BR2_PACKAGE_MADPLAY is not set
 # BR2_PACKAGE_MPG123 is not set
 BR2_GRAPHIC_SUPPORT=y
@@ -444,47 +549,59 @@ BR2_GRAPHIC_SUPPORT=y
 # graphic libraries
 #
 # BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
 # BR2_PACKAGE_JPEG is not set
 # BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBUNGIF is not set
 # BR2_PACKAGE_SDL is not set
 # BR2_PACKAGE_TIFF is not set
 
 #
-# other GUIs
+# busybox graphic applications
 #
-# BR2_PACKAGE_QTE is not set
-# BR2_PACKAGE_QTOPIA4 is not set
 
 #
-# X Window System server
+# --> (May be broken in busybox)
 #
-# BR2_PACKAGE_XORG is not set
-# BR2_PACKAGE_TINYX is not set
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_FBSET is not set
+
+#
+# other GUIs
+#
+# BR2_PACKAGE_QTE is not set
+# BR2_PACKAGE_QTOPIA4 is not set
+BR2_PACKAGE_XSERVER_none=y
+# BR2_PACKAGE_XSERVER_x11r7 is not set
+# BR2_PACKAGE_XSERVER_xorg is not set
+# BR2_PACKAGE_XSERVER_tinyx is not set
+BR2_X11_PREFIX="/usr"
 
 #
 # X libraries and helper libraries
 #
 # BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
 # BR2_PACKAGE_PANGO is not set
+# BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBGTK12 is not set
-# BR2_PACKAGE_LIBGTK2 is not set
 # BR2_PACKAGE_FONTCONFIG is not set
 # BR2_PACKAGE_FREETYPE is not set
+# BR2_PACKAGE_TSLIB is not set
 
 #
 # X Window managers
 #
-# BR2_PACKAGE_METACITY is not set
+# BR2_PACKAGE_MATCHBOX is not set
 
 #
 # X applications
 #
-# BR2_PACKAGE_DILLO is not set
-# BR2_PACKAGE_RDESKTOP is not set
-# BR2_PACKAGE_RXVT is not set
+
+#
+# Video libraries/codecs and applications
+#
+# BR2_PACKAGE_MPLAYER is not set
 BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
@@ -497,9 +614,10 @@ BR2_SCRIPTING_SUPPORT=y
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_RUBY is not set
 # BR2_PACKAGE_TCL is not set
+# BR2_PACKAGE_PHP is not set
 
 #
-# Target Options
+# Target filesystem options
 #
 
 #
@@ -541,112 +659,54 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
 #
 
 #
-# Linux Options
+# Kernel
 #
+# BR2_KERNEL_none is not set
+BR2_KERNEL_LINUX_ADVANCED=y
+# BR2_KERNEL_LINUX is not set
+# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
-BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG=y
+BR2_PACKAGE_LINUX_USE_KCONFIG=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config"
-# BR2_LINUX_2_6_SNAP is not set
-# BR2_LINUX_2_6_MM is not set
+BR2_PACKAGE_LINUX_FORMAT="uImage"
+BR2_KERNEL_CURRENT_VERSION="2.6.22"
+BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 # BR2_LINUX_2_6_STABLE is not set
-# BR2_LINUX_2_6_22_1 is not set
+# BR2_LINUX_2_6_23 is not set
+# BR2_LINUX_2_6_22_10 is not set
+BR2_LINUX_2_6_22_1=y
 # BR2_LINUX_2_6_22 is not set
-# BR2_LINUX_2_6_21_6 is not set
-# BR2_LINUX_2_6_21_1 is not set
+# BR2_LINUX_2_6_21_7 is not set
+# BR2_LINUX_2_6_21_5 is not set
 # BR2_LINUX_2_6_21 is not set
-BR2_LINUX_2_6_20_4=y
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_19_2 is not set
-# BR2_LINUX_2_6_19 is not set
-# BR2_LINUX_2_6_18 is not set
-# BR2_LINUX_2_6_17 is not set
-# BR2_LINUX_2_6_16 is not set
-# BR2_LINUX_2_6_15 is not set
-# BR2_LINUX_2_6_23 is not set
-# BR2_LINUX_CUSTOM is not set
+# BR2_LINUX26_CUSTOM is not set
 
 #
 # Patches
 #
 BR2_LINUX_BSP_PATCH="linux-2.6.20.4-atmel.patch.bz2"
-BR2_DOWNLOAD_LINUX26_VERSION="2.6.20.4"
-BR2_LINUX26_VERSION="2.6.20.4"
-BR2_LINUX26_RC_PATCH=""
-BR2_PACKAGE_LINUX_USE_KCONFIG=y
-# BR2_LINUX26_DEFCONFIG is not set
-# BR2_LINUX_CUSTOMIZE is not set
+BR2_KERNEL_PREPATCHED=y
+# BR2_KERNEL_BASE is not set
+# BR2_KERNEL_LATEST is not set
+BR2_DOWNLOAD_LINUX26_VERSION="2.6.22.1"
+BR2_LINUX26_VERSION="2.6.22.1"
+
+#
+# Linux Kernel Configuration
+#
+# BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
+# BR2_PACKAGE_LINUX_USE_XCONFIG is not set
 # BR2_LINUX_BIN_BZIMAGE is not set
-# BR2_LINUX_BIN_ZIMAGE is not set
-# BR2_LINUX_BIN_VMLINUX is not set
 BR2_LINUX_BIN_UIMAGE=y
+# BR2_LINUX_BIN_VMLINUX is not set
+# BR2_LINUX_BIN_ZIMAGE is not set
 # BR2_LINUX_BIN_CUSTOM is not set
-BR2_LINUX26_FORMAT="uImage"
 
 #
 # Destinations for linux kernel binaries
 #
-# BR2_LINUX_IN_ROOTFS is not set
-BR2_LINUX_COPY=y
+# BR2_LINUX_COPYTO_ROOTFS is not set
+BR2_LINUX_COPYTO_TFTPBOOT=y
 BR2_LINUX_COPYTO="/tftpboot"
-
-#
-# Board Support Options
-#
-# BR2_TARGET_ARM is not set
-BR2_TARGET_ATMEL=y
-
-#
-# Atmel AT91 Specific Device Support
-#
-BR2_TARGET_AT91=y
-# BR2_TARGET_AT91RM9200 is not set
-BR2_TARGET_AT91SAM9260=y
-# BR2_TARGET_AT91SAM9260A is not set
-# BR2_TARGET_AT91SAM9261 is not set
-# BR2_TARGET_AT91SAM9261S is not set
-# BR2_TARGET_AT91SAM9262 is not set
-# BR2_TARGET_AT91SAM9263 is not set
-# BR2_TARGET_AT91SAM9XE is not set
-# BR2_TARGET_AT91RM9200DF is not set
-# BR2_TARGET_AT91RM9200SE is not set
-# BR2_TARGET_AT91RM9200EK is not set
-# BR2_TARGET_AT91RM9200DK is not set
-BR2_TARGET_AT91SAM9260DFC=y
-# BR2_TARGET_AT91SAM9260EK is not set
-# BR2_TARGET_AT91SAM9261EK is not set
-# BR2_TARGET_AT91SAM9262EK is not set
-# BR2_TARGET_AT91SAM9263EK is not set
-# BR2_TARGET_AT91SAM9XEEK is not set
-BR2_BOARD_NAME="at91sam9260dfc"
-BR2_TARGET_AT91_ADVANCED_INFO=y
-
-#
-# Package support
-#
-
-#
-# Secondary locations
-#
-BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6"
-BR2_TARGET_ATMEL_COPYTO="/tftpboot"
-BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
-BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
-BR2_TARGET_UBOOT_GATEWAY="10.175.196.1"
-BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
-BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
-BR2_TARGET_AT91BOOTSTRAP=y
-# BR2_TARGET_AT91BOOT_DATAFLASH is not set
-BR2_TARGET_AT91BOOT_DATAFLASHCARD=y
-# BR2_TARGET_AT91BOOT_NANDFLASH is not set
-# BR2_TARGET_AT91BOOT_FLASH is not set
-BR2_TARGET_AT91BOOTSTRAP_MEMORY="dataflashcard"
-# BR2_TARGET_SHARP is not set
-
-#
-# Generic System Support
-#
-# BR2_TARGET_GENERIC_ACCESS_POINT is not set
-# BR2_TARGET_GENERIC_FIREWALL is not set
-# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
+BR2_LINUX_COPY_CONFIGURATION=y
diff --git a/target/linux-experimental/Makefile.in b/target/linux-experimental/Makefile.in
deleted file mode 100644
index ab9a6135d..000000000
--- a/target/linux-experimental/Makefile.in
+++ /dev/null
@@ -1,318 +0,0 @@
-#############################################################
-#
-# Linux kernel 2.6 target
-#
-#############################################################
-ifneq ($(filter $(TARGETS),linux26),)
-
-
-ifeq ($(LINUX_HEADERS_VERSION),)
-# Version of Linux to download and then apply patches to
-# XXX: andersee, i do not understand why we need this (BF)
-DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION)))
-# "))
-LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION)))
-# "))
-LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH)))
-# "))
-LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH)))
-# " ))
-MKIMAGE:=$(BUILD_DIR)/mkimage
-
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-DOWNLOAD_LINUX26_VERSION=2.6.19.2
-endif
-# Version of Linux after applying any patches
-LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
-
-
-else # ---------------------------------------------------
-
-# Define DOWNLOAD_LINUX26_VERSION unless defined
-ifeq ($(strip $(BR2_DOWNLOAD_LINUX26_VERSION)),)
-DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-else
-DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION)))
-# "))
-endif
-
-
-# Define LINUX26_VERSION unless defined
-ifeq ($(strip $(BR2_LINUX26_VERSION)),)
-LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-else
-LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION)))
-# "))
-endif
-
-endif # ---------------------------------------------------
-
-# Handle case when we want to build using an "rc" patch
-# Example: to build 2.6.21-rc1 you need to:
-# * Download linux-2.6.20
-# * Apply patch-2.6.21-rc1
-
-LINUX26_SOURCE:=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
-LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6
-LINUX26_BZCAT:=$(BZCAT)
-
-# Linux kernel binary
-LINUX26_FORMAT:=$(strip $(subst ",, $(BR2_LINUX26_FORMAT)))
-# " ))
-
-# Linux kernel configuration file
-ifeq ($(strip $(LINUX26_KCONFIG)),)
-LINUX26_KCONFIG=$(BR2_BOARD_PATH)/linux26.config
-endif
-
-# File name for the Linux kernel binary
-ifeq ($(strip $(LINUX26_KERNEL)),)
-#LINUX26_KERNEL=linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
-LINUX26_KERNEL:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE).gz
-endif
-
-ifeq ($(strip $(LINUX26_BINLOC)),)
-LINUX26_BINLOC=$(LINUX26_FORMAT)
-endif
-
-# Put binary in root file system
-ifeq ($(strip $(BR2_LINUX_IN_ROOTFS)),y)
-ifeq ($(strip $(LINUX26_TARGET)),)
-LINUX26_TARGET:=$(TARGET_DIR)/boot/$(LINUX26_BINLOC)
-endif
-else
-LINUX26_TARGET:=$(BINARIES_DIR)/$(LINUX26_KERNEL)
-endif
-endif
-
-ifeq ($(strip $(LINUX26_BUILD_DIR)),)
-LINUX26_BUILD_DIR=$(PROJECT_BUILD_DIR)
-endif
-
-ifeq ($(strip $(BR2_LINUX26_DEFCONFIG)),y)
-LINUX26_DEFCONFIG=$(BOARD_NAME)_defconfig
-endif
-
-# Version of Linux AFTER patches
-LINUX26_DIR=$(LINUX26_BUILD_DIR)/linux-$(LINUX26_VERSION)
-
-# for packages that need it
-LINUX_VERSION=$(LINUX26_VERSION)
-LINUX_DIR=$(LINUX26_DIR)
-LINUX_KERNEL=$(LINUX26_KERNEL)
-
-# kernel patches
-ifeq ($(strip $(subst ",, $(LINUX26_PATCH_DIR))),)
-# ")))
-LINUX26_PATCH_DIR:=$(BR2_BOARD_PATH)/kernel-patches/
-endif
-PATCH_DIR=$(strip $(subst ",, $(LINUX26_PATCH_DIR)))
-# " ))
-
-LINUX26_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) \
-	PATH=$(TARGET_PATH) INSTALL_MOD_PATH=$(TARGET_DIR) \
-	CROSS_COMPILE=$(KERNEL_CROSS)
-
-$(LINUX26_KCONFIG):
-	@if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
-		echo ""; \
-		echo "You should create a .config for your kernel"; \
-		echo "and install it as $(LINUX26_KCONFIG)"; \
-		echo ""; \
-		sleep 5; \
-	fi
-
-# Check if we have a release candidate.
-# This makes life complex
-# To build linux-2.6.21-rc2 you need to:
-# * Download linux.2.6.20.tar.bz2
-# * Download patch-2.6.21-rc2.bz2
-# I:E you have to download the *previous* major version
-
-ifneq ($(LINUX26_RC_PATCH),)
-# We have a "release candidate"
-LINUX26_RC_PATCH_SOURCE:=$(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH)
-
-# Create rule to download the patch
-$(LINUX26_RC_PATCH_SOURCE):
-	mkdir -p $(PROJECT_BUILD_DIR)/linux-patch/
-	$(WGET) -P $(PROJECT_BUILD_DIR)/linux-patch $(LINUX26_SITE)/$(LINUX26_RC_PATCH)
-# $(LINUX26_BZCAT) $(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH).bz2
-else
-# We have a vanilla style linux kernel
-LINUX26_RC_PATCH_SOURCE:=
-endif
-
-ifneq ($(strip $(LINUX_HEADERS_SOURCE)),$(strip $(LINUX26_SOURCE)))
-$(DL_DIR)/$(LINUX26_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LINUX26_SITE)/$(LINUX26_SOURCE)
-endif
-
-$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) $(LINUX26_RC_PATCH_SOURCE)
-	rm -rf $(LINUX26_DIR)
-	$(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(LINUX26_BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
-	# Rename the dir from the downloaded version to the AFTER patch version
-	mv -f $(LINUX26_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR)
-endif
-ifneq ($(LINUX26_RC_PATCH),)
-	-(cd $(LINUX26_DIR); $(LINUX26_BZCAT) $(LINUX26_RC_PATCH_SOURCE) | patch -p1)
-endif
-	-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX26_DIR) linux)
-	rm -f $(LINUX26_DIR)/.kernelrelease
-	echo $(LINUX26_VERSION) > $(LINUX26_DIR)/.kernelrelease
-	touch $@
-
-$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked
-	echo $(PATCH_DIR)
-	toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR)
-	touch $@
-
-$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG)
-	-ls -l $(LINUX26_DIR)/.patched
-	-ls -l $(LINUX26_KCONFIG)
-	-ls -l $(LINUX26_DIR)/.configured
-	-ls -l $(LINUX26_DIR)/.unpacked
-	-ls -l $(DL_DIR)/$(LINUX26_SOURCE)
-	-ls -l $(LINUX26_RC_PATCH_SOURCE)
-ifeq ($(strip $(BR2_LINUX26_DEFCONFIG)),y)
-	make ARCH=$(ARCH) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig
-else
-	cp -df --preserve=mode,ownership $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
-endif
-ifeq ($(strip $(BR2_LINUX_CUSTOMIZE)),y)
-	make -C $(LINUX26_DIR) xconfig
-endif
-	$(SED) '/CONFIG_AEABI/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_ARM_EABI),y)
-	echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config
-	$(SED) '/CONFIG_OABI_COMPAT/d' $(LINUX26_DIR)/.config
-	echo "# CONFIG_OABI_COMPAT is not set" >> $(LINUX26_DIR)/.config
-else
-	echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config
-endif
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig include/linux/version.h
-	touch $@
-
-$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
-	touch $@
-
-$(LINUX26_DIR)/arch/$(ARCH)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/vmlinux
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(LINUX26_FORMAT)
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules
-	touch -c $@
-
-$(LINUX26_DIR)/vmlinux: $(LINUX26_DIR)/.depend_done $(STAGING_DIR)/include/linux/version.h
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) vmlinux
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules
-	touch -c $@
-
-
-
-#-----------------------------------------------------------------------------------
-# Rule can be enabled by setting
-# LINUX26_TARGET:= $(TARGET_DIR)/boot/$(LINUX26_BINLOC)
-#
-$(TARGET_DIR)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/$(LINUX26_FORMAT)
-	[ -d $(TARGET_DIR)/boot/ ] || mkdir $(TARGET_DIR)/boot
-	cp -a $(LINUX26_DIR)/$(LINUX26_FORMAT) $(LINUX26_DIR)/System.map $(TARGET_DIR)/boot/$(LINUX26_FORMAT)
-	touch -c $@
-
-#-----------------------------------------------------------------------------------
-# Rule can be enabled by setting
-# LINUX26_TARGET:= $(BINARIES_DIR)/$(LINUX26_KERNEL)
-# LINUX26_FORMAT:= vmlinux
-
-$(BINARIES_DIR)/$(LINUX26_KERNEL): $(LINUX26_DIR)/uImage
-	cp -dpf $(LINUX26_DIR)/uImage $(BINARIES_DIR)/$(LINUX26_KERNEL)
-	cp -dpf $(LINUX26_DIR)/uImage /tftpboot/$(LINUX26_KERNEL)
-	mkdir -p $(TARGET_DIR)/boot/
-	cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config
-	cp -dpf .config $(TARGET_DIR)/boot/$(BOARD_NAME)-buildroot.config
-	cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config
-
-$(PROJECT_BUILD_DIR)/linux.bin: $(LINUX26_DIR)/vmlinux
-	${KERNEL_CROSS}objcopy -O binary -S $(LINUX26_DIR)/vmlinux $(PROJECT_BUILD_DIR)/linux.bin
-
-$(LINUX26_DIR)/uImage: $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage
-	cp -dpf $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage $(LINUX26_DIR)/uImage
-
-
-$(PROJECT_BUILD_DIR)/xxxx: $(PROJECT_BUILD_DIR)/linux.bin $(MKIMAGE)
-	gzip -v9 -c $(PROJECT_BUILD_DIR)/linux.bin > $(PROJECT_BUILD_DIR)/linux.bin.gz
-	$(MKIMAGE) -A $(ARCH) \
-				-O linux \
-				-C gzip \
-				-a 0x20008000 \
-				-e 0x20008000 \
-				-d $(PROJECT_BUILD_DIR)/linux.bin.gz \
-				$(LINUX26_DIR)/uImage
-	rm -f $(PROJECT_BUILD_DIR)/linux.bin.gz
-#-----------------------------------------------------------------------------------
-
-$(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_TARGET) $(TARGET_DIR)/sbin/modprobe $(LINUX26_DIR)/vmlinux
-	rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)
-	rm -f $(TARGET_DIR)/sbin/cardmgr
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
-		DEPMOD=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 \
-		INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-	(cd $(TARGET_DIR)/lib/modules; \
-	  rm -f drivers; \
-	  ln -s $(LINUX26_VERSION)/kernel/drivers .)
-	chmod a+x target/depmod.pl
-	target/depmod.pl \
-		-b $(TARGET_DIR)/lib/modules/$(DOWNLOAD_LINUX26_VERSION) \
-		-k $(LINUX26_DIR)/vmlinux \
-		-F $(LINUX26_DIR)/System.map \
-		> $(TARGET_DIR)/lib/modules/$(shell cat $(LINUX26_DIR)/include/config/kernel.release 2> /dev/null)/modules.dep
-	rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/build
-	touch -c $@
-
-$(STAGING_DIR)/include/linux/version.h: $(LINUX26_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/include
-	tar -ch -C $(LINUX26_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-	tar -ch -C $(LINUX26_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
-
-linux26-menuconfig: $(LINUX26_DIR)/.patched host-sed
-	[ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-	-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-
-linux26: cross-depmod26 $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep $(LINUX26_TARGET)
-
-linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-
-# This has been renamed so we do _NOT_ by default run this on 'make clean'
-linux26clean:
-	rm -f $(LINUX26_TARGET)
-	rm -f $(PROJECT_BUILD_DIR)/linux.bin
-	rm -f $(LINUX26_DIR)/uImage
-	-$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
-
-linux26-dirclean:
-	rm -f $(LINUX26_TARGET)
-	rm -f $(PROJECT_BUILD_DIR)/linux.bin
-	rm -rf $(LINUX26_DIR)
-
-linux-update:
-	cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
-
-linux-test:
-	@echo "LINUX_HEADERS_VERSION" $(LINUX_HEADERS_VERSION)
-	@echo "BR2_PACKAGE_LINUX" $(BR2_PACKAGE_LINUX)
-	@echo "BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION" $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION)
-	@echo "BR2_CUSTOM_LINUX26_VERSION" $(BR2_CUSTOM_LINUX26_VERSION)
-	@echo "BR2_CUSTOM_LINUX26_RC_PATCH" $(BR2_CUSTOM_LINUX26_RC_PATCH)
-	@echo "BR2_LINUX_BSP_PATCH" $(BR2_LINUX_BSP_PATCH)
-	@echo "BR2_DOWNLOAD_LINUX26_VERSION" $(BR2_DOWNLOAD_LINUX26_VERSION)
-	@echo "BR2_LINUX26_VERSION" $(BR2_LINUX26_VERSION)
-	@echo "LINUX26_VERSION" $(LINUX26_VERSION)
-	@echo "BR2_LINUX26_RC_PATCH" $(BR2_LINUX26_RC_PATCH)
-	@echo "BR2_PACKAGE_LINUX26_KCONFIG" $(BR2_PACKAGE_LINUX_KCONFIG)
-	@echo "LINUX26_KCONFIG" $(LINUX26_KCONFIG)
-	@echo "BR2_LINUX_BIN_CUSTOM" $(BR2_LINUX_BIN_CUSTOM)
-	@echo "BR2_PACKAGE_LINUX_FORMAT" $(BR2_PACKAGE_LINUX_FORMAT)
-	@echo "BR2_LINUX_IN_ROOTFS" $(BR2_LINUX_IN_ROOTFS)
-	@echo "BR2_LINUX_2_6_22_1" $(BR2_LINUX_2_6_22_1)
-
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 4402381bb..c79fca2dd 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,28 +1,6 @@
 #comment "Linux kernel options"
 
-config BR2_PACKAGE_LINUX
-	bool "linux kernel"
-	depends on BR2_KERNEL_LINUX
-	default y
-	help
-	  The Linux kernel.
-	  http://www.kernel.org/
-
-	  Note: Requires kernel-headers >= 2.6.19 since the other
-	        kernel headers are just that (headers) and not full
-	        kernels. This is a feature.
-
-config BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG
-	bool "linux kernel experimental configuration"
-	depends on BR2_PACKAGE_LINUX
-	depends on BR2_TARGET_ATMEL
-	default n
-	help
-	  More advanced configuration (in development)
-
-
-
-if ! BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG
+if BR2_KERNEL_LINUX
 config BR2_PACKAGE_LINUX_KCONFIG
 	string ".config file"
 	depends on BR2_PACKAGE_LINUX
@@ -53,350 +31,3 @@ config BR2_PACKAGE_LINUX_FORMAT
 	  board-imposed value by passing LINUX26_FORMAT=<string> to
 	  make.
 endif
-
-if BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG
-
-choice
-	prompt "Linux Kernel Version"
-	depends on BR2_PACKAGE_LINUX
-	default BR2_LINUX_2_6_22_1 if !BR2_avr32
-	default BR2_LINUX_2_6_22_10 if BR2_avr32
-	help
-	  Select the specific Linux version you want to use
-
-config BR2_LINUX_2_6_SNAP
-	bool "The latest snapshot for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.x-git#
-
-config BR2_LINUX_2_6_MM
-	bool "With latest -mm patch for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.x-rc#-mm#
-
-config BR2_LINUX_2_6_STABLE
-	bool "The latest stable Linux kernel (2.6.22.1)"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.22.1
-
-config BR2_LINUX_2_6_22_10
-	bool "Linux 2.6.22.10"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.22.10
-
-config BR2_LINUX_2_6_22_1
-	bool "Linux 2.6.22.1"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.22.1
-
-config BR2_LINUX_2_6_22
-	bool "Linux 2.6.22"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.22
-
-config BR2_LINUX_2_6_21_6
-	bool "Linux 2.6.21.6"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.21.6
-
-config BR2_LINUX_2_6_21_1
-	bool "Linux 2.6.21.1"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.21.1
-
-config BR2_LINUX_2_6_21
-	bool "Linux 2.6.21"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.21
-
-config BR2_LINUX_2_6_20_4
-	bool "Linux 2.6.20.4"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.20.4
-
-config BR2_LINUX_2_6_20
-	bool "Linux 2.6.20"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.20
-
-config BR2_LINUX_2_6_19_2
-	bool "Linux 2.6.19.2"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.19.2
-
-config BR2_LINUX_2_6_19
-	bool "Linux 2.6.19"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.19
-
-config BR2_LINUX_2_6_18
-	bool "Linux 2.6.18"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.18
-
-config BR2_LINUX_2_6_17
-	bool "Linux 2.6.17"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.17
-
-config BR2_LINUX_2_6_16
-	bool "Linux 2.6.16"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.16
-
-config BR2_LINUX_2_6_15
-	bool "Linux 2.6.15"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.15
-
-config BR2_LINUX_2_6_23
-	bool "Linux 2.6.23"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.23
-
-config BR2_LINUX_CUSTOM
-	bool "Linux <custom> version"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux <your selection>
-
-endchoice
-
-config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION
-	string "Linux Tarball version"
-	depends on BR2_LINUX_CUSTOM
-	default "linux-2.6.22"
-
-config BR2_CUSTOM_LINUX26_VERSION
-	string "Linux Version"
-	depends on BR2_LINUX_CUSTOM
-	default "linux-2.6.22-version"
-
-config BR2_CUSTOM_LINUX26_RC_PATCH
-	string "RC patch (if needed)"
-	depends on BR2_LINUX_CUSTOM
-	default "patch-2.6.22-rc6-mm1.bz2"
-
-menu "Patches"
-	depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_BSP_PATCH
-	string "Additional patch to apply (supply full path)"
-	default ""
-
-endmenu
-
-config BR2_DOWNLOAD_LINUX26_VERSION
-	string #"Selected Tarball:"
-	default "2.6.15" if BR2_LINUX_2_6_15
-	default "2.6.16" if BR2_LINUX_2_6_16
-	default "2.6.17" if BR2_LINUX_2_6_17
-	default "2.6.18" if BR2_LINUX_2_6_18
-	default "2.6.19" if BR2_LINUX_2_6_19
-	default "2.6.19.2" if BR2_LINUX_2_6_19_2
-	default "2.6.20" if BR2_LINUX_2_6_20
-	default "2.6.20.4" if BR2_LINUX_2_6_20_4
-	default "2.6.21" if BR2_LINUX_2_6_21
-	default "2.6.21.1" if BR2_LINUX_2_6_21_1
-	default "2.6.21.6" if BR2_LINUX_2_6_21_6
-	default "2.6.22" if BR2_LINUX_2_6_22
-	default "2.6.22.1" if BR2_LINUX_2_6_22_1
-	default "2.6.22.10" if BR2_LINUX_2_6_22_10
-	default "2.6.22" if BR2_LINUX_2_6_23_RC1
-	default "2.6.22" if BR2_LINUX_2_6_SNAP
-	default "2.6.22" if BR2_LINUX_2_6_MM
-	default $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) if BR2_LINUX_CUSTOM
-
-config BR2_LINUX26_VERSION
-	string #"Selected Version:"
-	default "2.6.15" if BR2_LINUX_2_6_15
-	default "2.6.16" if BR2_LINUX_2_6_16
-	default "2.6.17" if BR2_LINUX_2_6_17
-	default "2.6.18" if BR2_LINUX_2_6_18
-	default "2.6.19" if BR2_LINUX_2_6_19
-	default "2.6.19.2" if BR2_LINUX_2_6_19_2
-	default "2.6.20" if BR2_LINUX_2_6_20
-	default "2.6.20.4" if BR2_LINUX_2_6_20_4
-	default "2.6.21" if BR2_LINUX_2_6_21
-	default "2.6.21.1" if BR2_LINUX_2_6_21_1
-	default "2.6.21.6" if BR2_LINUX_2_6_21_6
-	default "2.6.22" if BR2_LINUX_2_6_22
-	default "2.6.22.1" if BR2_LINUX_2_6_22_1
-	default "2.6.22.10" if BR2_LINUX_2_6_22_10
-	default "2.6.22" if BR2_LINUX_2_6_23_RC1
-	default "2.6.22" if BR2_LINUX_2_6_SNAP
-	default "2.6.22" if BR2_LINUX_2_6_MM
-	default $(BR2_CUSTOM_LINUX26_VERSION) if BR2_LINUX_CUSTOM
-
-config BR2_LINUX26_RC_PATCH
-	string #"Selected Patch:"
-	default "" if BR2_LINUX_2_6_15
-	default "" if BR2_LINUX_2_6_16
-	default "" if BR2_LINUX_2_6_17
-	default "" if BR2_LINUX_2_6_18
-	default "" if BR2_LINUX_2_6_19
-	default "" if BR2_LINUX_2_6_19_2
-	default "" if BR2_LINUX_2_6_20
-	default "" if BR2_LINUX_2_6_20_4
-	default "" if BR2_LINUX_2_6_21
-	default "" if BR2_LINUX_2_6_21_1
-	default "" if BR2_LINUX_2_6_21_6
-	default "" if BR2_LINUX_2_6_22
-	default "" if BR2_LINUX_2_6_22_1
-	default "" if BR2_LINUX_2_6_22_10
-	default "patch-2.6.23-rc1.bz2" if BR2_LINUX_2_6_23_RC1
-	default $(BR2_CUSTOM_LINUX26_RC_PATCH) if BR2_LINUX_CUSTOM
-
-choice
-	prompt "Linux Kernel Configuration"
-	depends on BR2_PACKAGE_LINUX
-	default BR2_PACKAGE_LINUX_USE_KCONFIG
-	help
-	  Select the way to configure the Linux
-
-config BR2_PACKAGE_LINUX_USE_KCONFIG
-	bool ".config file"
-	depends on BR2_PACKAGE_LINUX
-	help
-	  kernel's .config to use to build a kernel for the target.
-
-	  If the above setting is empty, you can change the default
-	  board-imposed value by passing LINUX26_KCONFIG=<path> to
-	  make.
-
-config BR2_LINUX26_DEFCONFIG
-	bool "Run make <board>_defconfig "
-	depends BR2_PACKAGE_LINUX
-	help
-	  Configure Linux by make <board>_defconfig
-
-config BR2_LINUX_CUSTOMIZE
-	bool "Run make ARCH=$(ARCH) xconfig before build"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Configure Linux by make xconfig
-endchoice
-
-config BR2_PACKAGE_LINUX_KCONFIG
-	string ".config file"
-	depends on BR2_PACKAGE_LINUX_USE_KCONFIG
-	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config"
-	help
-	  kernel's .config to use to build a kernel for the target.
-
-	  If the above setting is empty, you can change the default
-	  board-imposed value by passing LINUX26_KCONFIG=<path> to
-	  make.
-
-choice
-	prompt "kernel binary format"
-	depends on BR2_PACKAGE_LINUX
-	default BR2_LINUX_BIN_UIMAGE
-	help
-	  Select the specific Linux binary type you want to use
-
-config BR2_LINUX_BIN_BZIMAGE
-	bool "bzImage"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.19.2
-
-config BR2_LINUX_BIN_UIMAGE
-	bool "uImage"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Build uImage binary
-
-config BR2_LINUX_BIN_VMLINUX
-	bool "vmlinux"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Build vmlinux binary
-
-config BR2_LINUX_BIN_ZIMAGE
-	bool "zImage"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Linux 2.6.19.2
-
-config BR2_LINUX_BIN_CUSTOM
-	bool "<custom> Linux binary"
-	depends BR2_PACKAGE_LINUX
-	help
-	  Build custom Linux binary format
-endchoice
-
-config BR2_LINUX_BIN_CUSTOM_BIN
-	string "custom kernel binary format"
-	depends on BR2_LINUX_BIN_CUSTOM
-	default ""
-	help
-	  Which Linux binary format?
-
-config BR2_PACKAGE_LINUX_FORMAT
-	string #"kernel binary format"
-	depends on BR2_PACKAGE_LINUX
-	default "bzImage" if BR2_LINUX_BIN_BZIMAGE
-	default "uImage" if BR2_LINUX_BIN_UIMAGE
-	default "vmlinux" if BR2_LINUX_BIN_VMLINUX
-	default "zImage" if BR2_LINUX_BIN_ZIMAGE
-	default $(BR2_LINUX_BIN_CUSTOM_BIN) if BR2_LINUX_BIN_CUSTOM
-	help
-	  kernel binary format.
-	  Popular values include:
-	  - bzImage
-	  - zImage
-	  - vmlinux
-	  - zImage
-	  - xipImage
-	  and other, architecture dependant formats.
-
-	  Note that the default format is supposed to be set by your
-	  board-description, if any.
-	  i386 and compatible default to bzImage if nothing was given
-	  above.
-	  If the above setting is empty, you can change the default
-	  board-imposed value by passing LINUX26_FORMAT=<string> to
-	  make.
-
-comment "Destinations for linux kernel binaries"
-	depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_IN_ROOTFS
-	bool "Copy kernel to root file system"
-	depends BR2_PACKAGE_LINUX
-	default n
-	help
-	  Copy kernel to <root>/boot directory
-
-menuconfig BR2_LINUX_COPY
-	bool "Secondary Copy"
-	depends on BR2_PACKAGE_LINUX
-	default y
-
-config BR2_LINUX_COPYTO
-	string "also copy the image to..."
-	depends BR2_LINUX_COPY
-	default "/tftpboot"
-	help
-	  Copy kernel to secondary location
-
-endif
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
new file mode 100644
index 000000000..3b3085a22
--- /dev/null
+++ b/target/linux/Config.in.advanced
@@ -0,0 +1,501 @@
+if BR2_KERNEL_LINUX_ADVANCED
+# --- "Linux kernel options"
+# This file exports the following symbols for use by Makefile's
+# 
+# BR2_PACKAGE_LINUX
+# 
+# BR2_KERNEL_SITE
+# BR2_DOWNLOAD_LINUX26_VERSION
+# BR2_LINUX26_VERSION
+# 
+# BR2_KERNEL_PATCH_SITE
+# BR2_KERNEL_PATCH
+# 
+# BR2_LINUX26_CUSTOM
+# BR2_CUSTOM_LINUX26_PATCH_SITE
+# BR2_CUSTOM_LINUX26_PATCH
+# 
+# BR2_LINUX_BSP_PATCH
+# 
+# BR2_PACKAGE_LINUX_USE_KCONFIG
+# BR2_PACKAGE_LINUX_USE_DEFCONFIG
+# BR2_PACKAGE_LINUX_USE_XCONFIG
+# BR2_PACKAGE_LINUX_KCONFIG
+# 
+# BR2_PACKAGE_LINUX_FORMAT
+# 
+# BR2_LINUX_COPYTO_ROOTFS
+# BR2_LINUX_COPYTO_TFTPBOOT
+# BR2_LINUX_COPYTO
+# 
+# ---------------------------------------------------------------------------
+# --- These 'constants' requires regular maintenance, so put them first
+config BR2_KERNEL_PATCH_LEVEL
+	string
+	default "1" if BR2_LINUX_2_6_23 && BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "10" if BR2_LINUX_2_6_22 && BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "7" if BR2_LINUX_2_6_21 && BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "20" if BR2_LINUX_2_6_20 && BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "$(BR2_KERNEL_MINORLEVEL)" if BR2_KERNEL_ADD_MINORPATCH
+
+config BR2_KERNEL_CURRENT_VERSION
+	string
+	default "2.6.23.1"
+
+config BR2_KERNEL_NEXT_VERSION
+	string
+	default "2.6.24" if BR2_LINUX_2_6_23
+	default "2.6.23" if BR2_LINUX_2_6_22
+	default "2.6.22" if BR2_LINUX_2_6_21
+	default "2.6.21" if BR2_LINUX_2_6_20
+
+config BR2_KERNEL_THIS_VERSION
+	string
+	default "2.6.23" if BR2_LINUX_2_6_23
+	default "2.6.22" if BR2_LINUX_2_6_22
+	default "2.6.21" if BR2_LINUX_2_6_21
+	default "2.6.20" if BR2_LINUX_2_6_20
+
+config LINUX26_LATEST_RC_VERSION
+	string
+	default "2.6.23" if BR2_KERNEL_ADD_LATEST_RC_PATCH
+
+config LINUX26_LATEST_MM_VERSION
+	string
+	default "2.6.23-mm1" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+
+config LINUX26_LATEST_GIT_VERSION
+	string
+	default "2.6.23-git3" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+
+config BR2_KERNEL_SITE
+	string
+	default "http://ftp.kernel.org/pub/linux/kernel/v2.6/"
+
+config BR2_MM_PATCH_SITE
+	string
+	default "http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
+
+config BR2_MM_PATCH_DIR
+	string
+	default "$(BR2_DOWNLOAD_LINUX26_VERSION)/$(LINUX26_LATEST_MM_VERSION)" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+	default "$(BR2_DOWNLOAD_LINUX26_VERSION)/$(BR2_LINUX26_MM_VERSION)" if BR2_KERNEL_ADD_MM_PATCH
+
+config BR2_RC_MM_PATCH_DIR
+	string
+	default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
+
+config BR2_KERNEL_PATCH_SITE
+	string
+	default "http://ftp.kernel.org/pub/linux/kernel/v2.6/" if BR2_KERNEL_ADD_MINORPATCH
+	default "http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/" if BR2_KERNEL_ADD_RC_PATCH || BR2_KERNEL_ADD_LATEST_RC_PATCH
+	default "http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/" if BR2_KERNEL_ADD_SNAPSHOT || BR2_KERNEL_ADD_LATEST_SNAPSHOT
+	default "$(BR2_MM_PATCH_SITE)/$(BR2_MM_PATCH_DIR)/" if BR2_KERNEL_ADD_MM_PATCH || BR2_KERNEL_ADD_LATEST_MM_PATCH
+	default $(BR2_CUSTOM_LINUX26_PATCH_SITE) if BR2_LINUX26_CUSTOM
+
+config BR2_LINUX26_RC_VERSION
+	string
+	default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)" if BR2_KERNEL_ADD_RC_PATCH
+
+config BR2_LINUX26_SNAPSHOT_VERSION
+	string
+	default "$(BR2_KERNEL_THIS_VERSION)-git$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
+
+config BR2_LINUX26_RC_SNAPSHOT_VERSION
+	string
+	default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-git$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
+
+config BR2_LINUX26_MM_VERSION
+	string
+	default "$(BR2_KERNEL_THIS_VERSION)-mm$(BR2_KERNEL_MM_LEVEL)" if BR2_KERNEL_ADD_MM_PATCH
+
+config BR2_LINUX26_RC_MM_VERSION
+	string
+	default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)" if BR2_KERNEL_ADD_MM_PATCH
+
+# ---------------------------------------------------------------------------
+
+choice
+	prompt "Linux Kernel Version"
+	default BR2_LINUX_2_6_22_10 if BR2_avr32
+	default BR2_LINUX_2_6_22_1 if !BR2_avr32 && BR2_TARGET_ATMEL
+	default BR2_LINUX_2_6_22 if !BR2_TARGET_ATMEL
+	help
+	  Select the specific Linux version you want to use
+
+config BR2_LINUX_2_6_STABLE
+	bool "The latest stable Linux kernel (2.6.23)"
+	help
+	  Linux 2.6.23
+
+config BR2_LINUX_2_6_23
+	bool "Linux 2.6.23"
+	select BR2_KERNEL_BASE
+	help
+	  Linux 2.6.23
+
+config BR2_LINUX_2_6_22_10
+	bool "Linux 2.6.22.10"
+	select BR2_KERNEL_PREPATCHED
+	help
+	  Linux 2.6.22.10
+
+config BR2_LINUX_2_6_22_1
+	bool "Linux 2.6.22.1"
+	select BR2_KERNEL_PREPATCHED
+	help
+	  Linux 2.6.22.1
+
+config BR2_LINUX_2_6_22
+	bool "Linux 2.6.22"
+	select BR2_KERNEL_LATEST
+	select BR2_KERNEL_BASE
+	help
+	  Linux 2.6.22
+
+config BR2_LINUX_2_6_21_7
+	bool "Linux 2.6.21.7"
+	select BR2_KERNEL_PREPATCHED
+	help
+	  Linux 2.6.21.1
+
+config BR2_LINUX_2_6_21_5
+	bool "Linux 2.6.21.5"
+	select BR2_KERNEL_PREPATCHED
+	help
+	  Linux 2.6.21.5
+
+config BR2_LINUX_2_6_21
+	bool "Linux 2.6.21"
+	select BR2_KERNEL_BASE
+	help
+	  Linux 2.6.21
+
+config BR2_LINUX_2_6_20
+	bool "Linux 2.6.20"
+	select BR2_KERNEL_BASE
+	help
+	  Linux 2.6.20
+
+config BR2_LINUX26_CUSTOM
+	bool "Linux <custom> version"
+	help
+	  Linux <your selection>
+
+endchoice
+
+if BR2_LINUX26_CUSTOM
+config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION
+	string "Linux Tarball version"
+	default "linux-2.6.22"
+	help
+	  Specify any .tar.bz2 file
+
+config BR2_CUSTOM_LINUX26_VERSION
+	string "Linux Version"
+	default "linux-2.6.22-version"
+	help
+	  Specify what the linux version will be called
+
+config BR2_CUSTOM_LINUX26_PATCH
+	string "patch name"
+	default "patch-2.6.22-rc6-mm1.bz2"
+	help
+	  Specify a patch to be downloaded
+
+config BR2_CUSTOM_LINUX26_PATCH_SITE
+	string "patch site"
+	default "http://"
+	help
+	  Specify from where the patch will be downloaded.
+
+endif
+
+# -----------------------------------------------
+
+menu "Patches"
+	depends on BR2_PACKAGE_LINUX
+
+choice
+	prompt "Add a patch to the Linux Kernel"
+	depends on BR2_PACKAGE_LINUX
+	depends on !BR2_KERNEL_PREPATCHED
+	default BR2_KERNEL_ADD_NO_PATCH
+	help
+	  Select a patch to add to the Linux kernel
+
+config BR2_KERNEL_ADD_NO_PATCH
+	bool "Do not add a patch"
+
+config BR2_KERNEL_ADD_LATEST_MINORPATCH
+	bool "Add _latest_ '.#' minor patch"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_MINORPATCH
+	bool "Add a '.#' minor patch"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_LATEST_RC_PATCH
+	bool "Add _latest_ '-rc#' patch"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_RC_PATCH
+	bool "Add an '-rc#' patch"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_LATEST_SNAPSHOT
+	bool "Add _latest_ 'snapshot' patch"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_SNAPSHOT
+	bool "Add a 'snapshot' patch (linux-2.6.X-rc#-git#)"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_LATEST_MM_PATCH
+	bool "Add latest '-mm' patch for the stable linux kernel"
+	select BR2_KERNEL_ADD_PATCH
+
+config BR2_KERNEL_ADD_MM_PATCH
+	bool "Add an '-mm#' patch for the stable linux kernel"
+	select BR2_KERNEL_ADD_PATCH
+
+endchoice
+
+config BR2_KERNEL_ADD_PATCH
+	bool
+	default n
+
+
+config BR2_KERNEL_MINORLEVEL
+	string "patch level"
+	default ""
+	depends on BR2_KERNEL_ADD_MINORPATCH
+
+config BR2_KERNEL_RC_LEVEL
+	string "-rc patch Level"
+	default ""
+	depends on BR2_KERNEL_ADD_RC_PATCH || BR2_KERNEL_ADD_SNAPSHOT
+
+config BR2_KERNEL_GIT_LEVEL
+	string "-git patch Level"
+	default ""
+	depends on BR2_KERNEL_ADD_SNAPSHOT
+
+config BR2_KERNEL_MM_LEVEL
+	string "-mm patch Level"
+	default ""
+	depends on BR2_KERNEL_ADD_MM_PATCH
+
+config BR2_LINUX_BSP_PATCH
+	string "Additional patch to apply (from \$(DL_DIR))"
+	default ""
+	help
+	  Apply a patch located in \$(DL_DIR).
+	  You need to download or create this before
+	  enable this option
+
+config BR2_KERNEL_PATCH
+	string
+	default "patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2" if BR2_KERNEL_ADD_MINORPATCH || BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "patch-$(LINUX26_LATEST_RC_VERSION).bz2" if BR2_KERNEL_ADD_LATEST_RC_PATCH
+	default "patch-$(BR2_LINUX26_RC_VERSION).bz2" if BR2_KERNEL_ADD_RC_PATCH
+	default "patch-$(LINUX26_LATEST_GIT_VERSION).bz2" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+	default "patch-$(BR2_LINUX26_SNAPSHOT_VERSION).bz2" if BR2_KERNEL_ADD_SNAPSHOT
+	default "$(LINUX26_LATEST_MM_VERSION).bz2" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+	default "$(BR2_LINUX26_MM_VERSION).bz2" if BR2_KERNEL_ADD_MM_PATCH
+	default $(BR2_CUSTOM_LINUX26_PATCH) if BR2_LINUX26_CUSTOM
+
+endmenu
+
+# -----------------------------------------------
+
+config BR2_KERNEL_PREPATCHED
+	bool
+	default n
+
+config BR2_KERNEL_BASE
+	bool
+	default n
+
+config BR2_KERNEL_LATEST
+	bool
+	default n
+
+config BR2_DOWNLOAD_LINUX26_VERSION
+	string
+	default "$(BR2_KERNEL_THIS_VERSION)" if BR2_KERNEL_BASE
+	default "2.6.21.5" if BR2_LINUX_2_6_21_5
+	default "2.6.21.7" if BR2_LINUX_2_6_21_7
+	default "2.6.22.1" if BR2_LINUX_2_6_22_1
+	default "2.6.22.10" if BR2_LINUX_2_6_22_10
+	default "$(BR2_KERNEL_CURRENT_VERSION)"if BR2_LINUX_2_6_STABLE
+	default "$(BR2_DEFAULT_KERNEL_HEADERS)" if BR2_KERNEL_LINUX_HEADERS_VERSION
+	default $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) if BR2_LINUX26_CUSTOM
+
+config BR2_LINUX26_VERSION
+	string
+	default "$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)" if BR2_KERNEL_BASE && BR2_KERNEL_ADD_MINORPATCH
+	default "$(LINUX26_LATEST_RC_VERSION)" if BR2_KERNEL_ADD_LATEST_RC_PATCH
+	default "$(LINUX26_LATEST_MM_VERSION)" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+	default "$(LINUX26_LATEST_GIT_VERSION)" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+	default "$(BR2_LINUX26_RC_VERSION)" if BR2_KERNEL_BASE && BR2_KERNEL_ADD_RC_PATCH
+	default "$(BR2_LINUX26_SNAPSHOT_VERSION)" if BR2_KERNEL_BASE && BR2_KERNEL_ADD_SNAPSHOT
+	default "$(BR2_LINUX26_MM_VERSION)" if BR2_KERNEL_BASE && BR2_KERNEL_ADD_MM_PATCH
+	default "$(BR2_KERNEL_THIS_VERSION)" if BR2_KERNEL_BASE && ! BR2_KERNEL_ADD_PATCH
+	default "2.6.21.5" if BR2_LINUX_2_6_21_5
+	default "2.6.21.7" if BR2_LINUX_2_6_21_7
+	default "2.6.22.1" if BR2_LINUX_2_6_22_1
+	default "2.6.22.10" if BR2_LINUX_2_6_22_10
+	default "$(BR2_KERNEL_CURRENT_VERSION)"if BR2_LINUX_2_6_STABLE
+	default $(BR2_CUSTOM_LINUX26_VERSION) if BR2_LINUX26_CUSTOM
+
+menu "Linux Kernel Configuration"
+
+choice
+	prompt "Linux Kernel Configuration"
+	depends on BR2_PACKAGE_LINUX
+	default BR2_PACKAGE_LINUX_USE_KCONFIG
+	help
+	  Select the way to configure the Linux
+
+config BR2_PACKAGE_LINUX_USE_KCONFIG
+	bool ".config file"
+	depends on BR2_PACKAGE_LINUX
+	help
+	  kernel's .config to use to build a kernel for the target.
+
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_KCONFIG=<path> to
+	  make.
+
+config BR2_PACKAGE_LINUX_USE_DEFCONFIG
+	bool "Run make <board>_defconfig "
+	depends BR2_PACKAGE_LINUX
+	help
+	  Configure Linux by make <board>_defconfig
+
+config BR2_PACKAGE_LINUX_USE_XCONFIG
+	bool "Run make ARCH=$(ARCH) xconfig before build"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Configure Linux by make xconfig
+endchoice
+
+config BR2_PACKAGE_LINUX_KCONFIG
+	string ".config file"
+	depends on BR2_PACKAGE_LINUX_USE_KCONFIG
+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
+	help
+	  kernel's .config to use to build a kernel for the target.
+
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_KCONFIG=<path> to
+	  make.
+
+endmenu
+
+choice
+	prompt "kernel binary format"
+	depends on BR2_PACKAGE_LINUX
+	default BR2_LINUX_BIN_UIMAGE
+	help
+	  Select the specific Linux binary type you want to use
+
+config BR2_LINUX_BIN_BZIMAGE
+	bool "bzImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19.2
+
+config BR2_LINUX_BIN_UIMAGE
+	bool "uImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build uImage binary
+
+config BR2_LINUX_BIN_VMLINUX
+	bool "vmlinux"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build vmlinux binary
+
+config BR2_LINUX_BIN_ZIMAGE
+	bool "zImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19.2
+
+config BR2_LINUX_BIN_CUSTOM
+	bool "<custom> Linux binary"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build custom Linux binary format
+endchoice
+
+config BR2_LINUX_BIN_CUSTOM_BIN
+	string "custom kernel binary format"
+	depends on BR2_LINUX_BIN_CUSTOM
+	default ""
+	help
+	  Which Linux binary format?
+
+config BR2_PACKAGE_LINUX_FORMAT
+	string #"kernel binary format"
+	depends on BR2_PACKAGE_LINUX
+	default "bzImage" if BR2_LINUX_BIN_BZIMAGE
+	default "uImage" if BR2_LINUX_BIN_UIMAGE
+	default "vmlinux" if BR2_LINUX_BIN_VMLINUX
+	default "zImage" if BR2_LINUX_BIN_ZIMAGE
+	default $(BR2_LINUX_BIN_CUSTOM_BIN) if BR2_LINUX_BIN_CUSTOM
+	help
+	  kernel binary format.
+	  Popular values include:
+	  - bzImage
+	  - zImage
+	  - vmlinux
+	  - zImage
+	  - xipImage
+	  and other, architecture dependant formats.
+
+	  Note that the default format is supposed to be set by your
+	  board-description, if any.
+	  i386 and compatible default to bzImage if nothing was given
+	  above.
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_FORMAT=<string> to
+	  make.
+
+menu "Destinations for linux kernel binaries"
+
+config BR2_LINUX_COPYTO_ROOTFS
+	bool "Copy kernel to root file system"
+	depends BR2_PACKAGE_LINUX
+	default n
+	help
+	  Copy kernel to <root>/boot directory
+
+config BR2_LINUX_COPYTO_TFTPBOOT
+	bool "Copy kernel to /tftpboot"
+	default y if BR2_TARGET_ATMEL
+	default n if !BR2_TARGET_ATMEL
+	help
+	  Copy kernel to /tftpboot directory
+
+config BR2_LINUX_COPYTO
+	string "Copy kernel to <dir>..."
+	default ""
+	help
+	  Copy kernel to secondary location
+
+endmenu
+
+config BR2_LINUX_COPY_CONFIGURATION
+	bool "Copy buildroot configuration to Linux file system"
+	default y if BR2_TARGET_ATMEL
+	default n if !BR2_TARGET_ATMEL
+	help
+	  The configuration files for buildroot, uclibc, busybox and linux
+	  are copied to the "<root>/boot" directory.
+
+endif
+
diff --git a/target/linux/Config.in.experimental b/target/linux/Config.in.experimental
new file mode 100644
index 000000000..92ffc9e4f
--- /dev/null
+++ b/target/linux/Config.in.experimental
@@ -0,0 +1,346 @@
+if BR2_KERNEL_LINUX_EXPERIMENTAL
+
+choice
+	prompt "Linux Kernel Version"
+	depends on BR2_PACKAGE_LINUX
+	default BR2_LINUX_2_6_22_1 if !BR2_avr32
+	default BR2_LINUX_2_6_22_10 if BR2_avr32
+	help
+	  Select the specific Linux version you want to use
+
+config BR2_LINUX_2_6_SNAP
+	bool "The latest snapshot for the stable Linux kernel"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.x-git#
+
+config BR2_LINUX_2_6_MM
+	bool "With latest -mm patch for the stable Linux kernel"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.x-rc#-mm#
+
+config BR2_LINUX_2_6_STABLE
+	bool "The latest stable Linux kernel (2.6.22.1)"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.22.1
+
+config BR2_LINUX_2_6_22_10
+	bool "Linux 2.6.22.10"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.22.10
+
+config BR2_LINUX_2_6_22_1
+	bool "Linux 2.6.22.1"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.22.1
+
+config BR2_LINUX_2_6_22
+	bool "Linux 2.6.22"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.22
+
+config BR2_LINUX_2_6_21_6
+	bool "Linux 2.6.21.6"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.21.6
+
+config BR2_LINUX_2_6_21_1
+	bool "Linux 2.6.21.1"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.21.1
+
+config BR2_LINUX_2_6_21
+	bool "Linux 2.6.21"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.21
+
+config BR2_LINUX_2_6_20_4
+	bool "Linux 2.6.20.4"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.20.4
+
+config BR2_LINUX_2_6_20
+	bool "Linux 2.6.20"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.20
+
+config BR2_LINUX_2_6_19_2
+	bool "Linux 2.6.19.2"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19.2
+
+config BR2_LINUX_2_6_19
+	bool "Linux 2.6.19"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19
+
+config BR2_LINUX_2_6_18
+	bool "Linux 2.6.18"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.18
+
+config BR2_LINUX_2_6_17
+	bool "Linux 2.6.17"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.17
+
+config BR2_LINUX_2_6_16
+	bool "Linux 2.6.16"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.16
+
+config BR2_LINUX_2_6_15
+	bool "Linux 2.6.15"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.15
+
+config BR2_LINUX_2_6_23
+	bool "Linux 2.6.23"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.23
+
+config BR2_LINUX_CUSTOM
+	bool "Linux <custom> version"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux <your selection>
+
+endchoice
+
+config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION
+	string "Linux Tarball version"
+	depends on BR2_LINUX_CUSTOM
+	default "linux-2.6.22"
+
+config BR2_CUSTOM_LINUX26_VERSION
+	string "Linux Version"
+	depends on BR2_LINUX_CUSTOM
+	default "linux-2.6.22-version"
+
+config BR2_CUSTOM_LINUX26_RC_PATCH
+	string "RC patch (if needed)"
+	depends on BR2_LINUX_CUSTOM
+	default "patch-2.6.22-rc6-mm1.bz2"
+
+menu "Patches"
+	depends on BR2_PACKAGE_LINUX
+
+config BR2_LINUX_BSP_PATCH
+	string "Additional patch to apply (supply full path)"
+	default ""
+
+endmenu
+
+config BR2_DOWNLOAD_LINUX26_VERSION
+	string #"Selected Tarball:"
+	default "2.6.15" if BR2_LINUX_2_6_15
+	default "2.6.16" if BR2_LINUX_2_6_16
+	default "2.6.17" if BR2_LINUX_2_6_17
+	default "2.6.18" if BR2_LINUX_2_6_18
+	default "2.6.19" if BR2_LINUX_2_6_19
+	default "2.6.19.2" if BR2_LINUX_2_6_19_2
+	default "2.6.20" if BR2_LINUX_2_6_20
+	default "2.6.20.4" if BR2_LINUX_2_6_20_4
+	default "2.6.21" if BR2_LINUX_2_6_21
+	default "2.6.21.1" if BR2_LINUX_2_6_21_1
+	default "2.6.21.6" if BR2_LINUX_2_6_21_6
+	default "2.6.22" if BR2_LINUX_2_6_22
+	default "2.6.22.1" if BR2_LINUX_2_6_22_1
+	default "2.6.22.10" if BR2_LINUX_2_6_22_10
+	default "2.6.22" if BR2_LINUX_2_6_23_RC1
+	default "2.6.22" if BR2_LINUX_2_6_SNAP
+	default "2.6.22" if BR2_LINUX_2_6_MM
+	default $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) if BR2_LINUX_CUSTOM
+
+config BR2_LINUX26_VERSION
+	string #"Selected Version:"
+	default "2.6.15" if BR2_LINUX_2_6_15
+	default "2.6.16" if BR2_LINUX_2_6_16
+	default "2.6.17" if BR2_LINUX_2_6_17
+	default "2.6.18" if BR2_LINUX_2_6_18
+	default "2.6.19" if BR2_LINUX_2_6_19
+	default "2.6.19.2" if BR2_LINUX_2_6_19_2
+	default "2.6.20" if BR2_LINUX_2_6_20
+	default "2.6.20.4" if BR2_LINUX_2_6_20_4
+	default "2.6.21" if BR2_LINUX_2_6_21
+	default "2.6.21.1" if BR2_LINUX_2_6_21_1
+	default "2.6.21.6" if BR2_LINUX_2_6_21_6
+	default "2.6.22" if BR2_LINUX_2_6_22
+	default "2.6.22.1" if BR2_LINUX_2_6_22_1
+	default "2.6.22.10" if BR2_LINUX_2_6_22_10
+	default "2.6.22" if BR2_LINUX_2_6_23_RC1
+	default "2.6.22" if BR2_LINUX_2_6_SNAP
+	default "2.6.22" if BR2_LINUX_2_6_MM
+	default $(BR2_CUSTOM_LINUX26_VERSION) if BR2_LINUX_CUSTOM
+
+config BR2_LINUX26_RC_PATCH
+	string #"Selected Patch:"
+	default "" if BR2_LINUX_2_6_15
+	default "" if BR2_LINUX_2_6_16
+	default "" if BR2_LINUX_2_6_17
+	default "" if BR2_LINUX_2_6_18
+	default "" if BR2_LINUX_2_6_19
+	default "" if BR2_LINUX_2_6_19_2
+	default "" if BR2_LINUX_2_6_20
+	default "" if BR2_LINUX_2_6_20_4
+	default "" if BR2_LINUX_2_6_21
+	default "" if BR2_LINUX_2_6_21_1
+	default "" if BR2_LINUX_2_6_21_6
+	default "" if BR2_LINUX_2_6_22
+	default "" if BR2_LINUX_2_6_22_1
+	default "" if BR2_LINUX_2_6_22_10
+	default "patch-2.6.23-rc1.bz2" if BR2_LINUX_2_6_23_RC1
+	default $(BR2_CUSTOM_LINUX26_RC_PATCH) if BR2_LINUX_CUSTOM
+
+choice
+	prompt "Linux Kernel Configuration"
+	depends on BR2_PACKAGE_LINUX
+	default BR2_PACKAGE_LINUX_USE_KCONFIG
+	help
+	  Select the way to configure the Linux
+
+config BR2_PACKAGE_LINUX_USE_KCONFIG
+	bool ".config file"
+	depends on BR2_PACKAGE_LINUX
+	help
+	  kernel's .config to use to build a kernel for the target.
+
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_KCONFIG=<path> to
+	  make.
+
+config BR2_LINUX26_DEFCONFIG
+	bool "Run make <board>_defconfig "
+	depends BR2_PACKAGE_LINUX
+	help
+	  Configure Linux by make <board>_defconfig
+
+config BR2_LINUX_CUSTOMIZE
+	bool "Run make ARCH=$(ARCH) xconfig before build"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Configure Linux by make xconfig
+endchoice
+
+config BR2_PACKAGE_LINUX_KCONFIG
+	string ".config file"
+	depends on BR2_PACKAGE_LINUX_USE_KCONFIG
+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config"
+	help
+	  kernel's .config to use to build a kernel for the target.
+
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_KCONFIG=<path> to
+	  make.
+
+choice
+	prompt "kernel binary format"
+	depends on BR2_PACKAGE_LINUX
+	default BR2_LINUX_BIN_UIMAGE
+	help
+	  Select the specific Linux binary type you want to use
+
+config BR2_LINUX_BIN_BZIMAGE
+	bool "bzImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19.2
+
+config BR2_LINUX_BIN_UIMAGE
+	bool "uImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build uImage binary
+
+config BR2_LINUX_BIN_VMLINUX
+	bool "vmlinux"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build vmlinux binary
+
+config BR2_LINUX_BIN_ZIMAGE
+	bool "zImage"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Linux 2.6.19.2
+
+config BR2_LINUX_BIN_CUSTOM
+	bool "<custom> Linux binary"
+	depends BR2_PACKAGE_LINUX
+	help
+	  Build custom Linux binary format
+endchoice
+
+config BR2_LINUX_BIN_CUSTOM_BIN
+	string "custom kernel binary format"
+	depends on BR2_LINUX_BIN_CUSTOM
+	default ""
+	help
+	  Which Linux binary format?
+
+config BR2_PACKAGE_LINUX_FORMAT
+	string #"kernel binary format"
+	depends on BR2_PACKAGE_LINUX
+	default "bzImage" if BR2_LINUX_BIN_BZIMAGE
+	default "uImage" if BR2_LINUX_BIN_UIMAGE
+	default "vmlinux" if BR2_LINUX_BIN_VMLINUX
+	default "zImage" if BR2_LINUX_BIN_ZIMAGE
+	default $(BR2_LINUX_BIN_CUSTOM_BIN) if BR2_LINUX_BIN_CUSTOM
+	help
+	  kernel binary format.
+	  Popular values include:
+	  - bzImage
+	  - zImage
+	  - vmlinux
+	  - zImage
+	  - xipImage
+	  and other, architecture dependant formats.
+
+	  Note that the default format is supposed to be set by your
+	  board-description, if any.
+	  i386 and compatible default to bzImage if nothing was given
+	  above.
+	  If the above setting is empty, you can change the default
+	  board-imposed value by passing LINUX26_FORMAT=<string> to
+	  make.
+
+comment "Destinations for linux kernel binaries"
+	depends on BR2_PACKAGE_LINUX
+
+config BR2_LINUX_IN_ROOTFS
+	bool "Copy kernel to root file system"
+	depends BR2_PACKAGE_LINUX
+	default n
+	help
+	  Copy kernel to <root>/boot directory
+
+menuconfig BR2_LINUX_COPY
+	bool "Secondary Copy"
+	depends on BR2_PACKAGE_LINUX
+	default y
+
+config BR2_LINUX_COPYTO
+	string "also copy the image to..."
+	depends BR2_LINUX_COPY
+	default "/tftpboot"
+	help
+	  Copy kernel to secondary location
+
+endif
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
new file mode 100644
index 000000000..29eace144
--- /dev/null
+++ b/target/linux/Makefile.in.advanced
@@ -0,0 +1,438 @@
+###############################################################################
+#
+# Linux kernel 2.6 target (Advanced configuration)
+#
+###############################################################################
+ifneq ($(filter $(TARGETS),linux26),)
+
+# -----------------------------------------------------------------------------
+# Make sure LINUX_HEADERS_VERSION is defined
+ifeq ($(LINUX_HEADERS_VERSION),)
+# We did not have headers (this is for real???)
+LINUX_HEADERS_VERSION:=2.6.22.1
+endif
+
+# -----------------------------------------------------------------------------
+# STRATEGY FOR DOWNLOAD_LINUX26_VERSION
+# 1. Use definition from user Makefile
+# 2. Use definition from Kconfig
+# 3. Use Linux Headers version
+# 4. Use default (2.6.22.1)
+ifeq ($(DOWNLOAD_LINUX26_VERSION),)
+ifneq ($(BR2_DOWNLOAD_LINUX26_VERSION),)
+DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",,$(BR2_DOWNLOAD_LINUX26_VERSION)))
+#"))
+else
+DOWNLOAD_LINUX26_VERSION:=$(LINUX_HEADERS_VERSION)
+endif
+endif
+
+# -----------------------------------------------------------------------------
+# STRATEGY FOR LINUX26_VERSION
+# 1. Use definition from user Makefile
+# 2. Use definition from Kconfig
+# 3. Use Linux Headers version
+# 4. Use default (2.6.22.1)
+ifeq ($(LINUX26_VERSION),)
+ifneq ($(BR2_LINUX26_VERSION),)
+LINUX26_VERSION:=$(strip $(subst ",,$(BR2_LINUX26_VERSION)))
+#"))
+else
+LINUX26_VERSION:=$(LINUX_HEADERS_VERSION)
+endif
+endif
+
+ifeq ($(BOARD_PATH),)
+BOARD_PATH:=$(strip $(subst ",,$(BR2_BOARD_PATH)))
+#"))
+endif
+
+# Version of Linux AFTER patches
+LINUX26_DIR:=$(PROJECT_BUILD_DIR)/linux-$(LINUX26_VERSION)
+
+# for packages that need it
+LINUX_VERSION:=$(LINUX26_VERSION)
+LINUX_DIR:=$(LINUX26_DIR)
+
+# -----------------------------------------------------------------------------
+# Define source name and sites
+LINUX26_SOURCE:=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
+LINUX26_SITE:=$(strip $(subst ",,$(BR2_KERNEL_SITE)))
+#"))
+
+LINUX26_PATCH_SOURCE:=$(strip $(subst ",,$(BR2_KERNEL_PATCH)))
+#"))
+LINUX26_PATCH_SITE:=$(strip $(subst ",,$(BR2_KERNEL_PATCH_SITE)))
+#"))
+
+LINUX26_BSP_PATCH:=$(strip $(subst ",,$(BR2_LINUX_BSP_PATCH)))
+#"))
+
+LINUX26_PATCH_SITE:=$(strip $(subst ",,$(BR2_KERNEL_SITE)))
+#"))
+
+# ------------------------------------
+# kernel patches provided by buildroot
+ifeq ($(strip $(LINUX26_PATCH_DIR)),)
+LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches-$(LINUX26_VERSION)/
+endif
+
+# -----------------------------------------------------------------------------
+# Linux kernel configuration file
+# This is used if BR2_PACKAGE_LINUX_USE_KCONFIG is set
+# Has to be set by the target/device
+# If it is not set by the target/device, then pick the one from .config
+ifndef LINUX26_KCONFIG
+ifneq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_KCONFIG))),)
+LINUX26_KCONFIG:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_KCONFIG)))
+#"))
+#"))
+else
+ifeq ($(BR2_i386),y)
+LINUX26_KCONFIG:=$(BOARD_PATH)/linux26.config
+else
+LINUX26_KCONFIG:=$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config
+endif
+endif
+endif
+
+# -----------------------------------------------------------------------------
+ifndef LINUX26_FORMAT
+ifneq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT))),)
+#"))
+LINUX26_FORMAT:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT)))
+#"))
+else
+LINUX26_FORMAT:=zImage
+endif
+endif
+
+# -----------------------------------------------------------------------------
+# Has to be set by the target/device
+ifeq ($(LINUX26_BINLOC),)
+
+# --------------
+# VMLINUX
+ifeq ($(LINUX26_FORMAT),vmlinux)
+LINUX26_BINLOC:=$(LINUX26_FORMAT)
+KERNEL_EXT:=
+endif
+
+# --------------
+# UIMAGE
+ifeq ($(LINUX26_FORMAT),uImage)
+ifeq ($(BR2_avr32),y)
+LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_FORMAT)
+else
+LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
+endif
+KERNEL_EXT:=.gz
+endif
+
+# --------------
+# ZIMAGE
+ifeq ($(LINUX26_FORMAT),zImage)
+LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
+KERNEL_EXT:=.z
+endif
+
+# --------------
+# BZIMAGE
+ifeq ($(LINUX26_FORMAT),bzImage)
+LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
+KERNEL_EXT:=.bz
+endif
+
+endif
+
+# -----------------------------------------------------------------------------
+# File name for the Linux kernel binary
+LINUX_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
+
+ifndef LINUX26_KERNEL
+LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
+endif
+
+# for packages that need it
+LINUX_KERNEL:=$(LINUX26_KERNEL)
+
+
+# -----------------------------------------------------------------------------
+LINUX26_BZCAT:=$(BZCAT)
+
+__LINUX26_NO_PIC=-fPIC -fpic -DPIC -fwrapv -ftrapv
+LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
+	ARCH=$(KERNEL_ARCH) \
+	CFLAGS_KERNEL="$(filter-out $(__LINUX26_NO_PIC),$(TARGET_CFLAGS))" \
+	INSTALL_MOD_PATH=$(TARGET_DIR) \
+	CROSS_COMPILE=$(KERNEL_CROSS) \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	LZMA="$(LZMA)" 
+
+# =============================================================================
+
+$(LINUX26_KCONFIG):
+	@if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
+		echo ""; \
+		echo "You should create a .config for your kernel"; \
+		echo "and install it as $(LINUX26_KCONFIG)"; \
+		echo ""; \
+		sleep 5; \
+	fi
+# =============================================================================
+ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION)))
+$(DL_DIR)/$(LINUX26_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(LINUX26_SITE)/$(LINUX26_SOURCE)
+endif # ($(LINUX26_VERSION),$(LINUX_HEADERS_VERSION))
+
+ifneq ($(strip $(LINUX26_PATCH_SOURCE)),)
+$(DL_DIR)/$(LINUX26_PATCH_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(LINUX26_PATCH_SITE)/$(LINUX26_PATCH_SOURCE)
+endif
+
+$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
+	rm -rf $(LINUX26_DIR)
+	@echo "*** Unpacking kernel source"
+	$(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
+ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
+	# Rename the dir from the downloaded version to the AFTER patch version
+	mv -f $(PROJECT_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR)
+endif
+	touch $@
+
+
+# -----------------------------------------------------------------------------
+LINUX26_TARGETS+=$(LINUX26_KERNEL)
+
+ifeq ($(BR2_LINUX_COPYTO_ROOTFS),y)
+LINUX26_TARGETS+=$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME)
+endif
+
+ifeq ($(BR2_LINUX_COPYTO_TFTPBOOT),y)
+LINUX26_TARGETS+=/tftpboot/$(LINUX26_KERNEL_NAME)
+endif
+
+ifneq ($(BR2_LINUX_COPYTO),)
+LINUX_COPYTO:=$(strip $(subst ",,$(BR2_LINUX_COPYTO)))
+#"))
+LINUX26_TARGETS+=$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
+endif
+
+ifneq ($(BR2_LINUX_COPY_CONFIGURATION),)
+LINUX26_TARGETS+=$(TARGET_DIR)/boot/buildroot.config
+LINUX26_TARGETS+=$(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config
+LINUX26_TARGETS+=$(TARGET_DIR)/boot/uclibc.config
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+LINUX26_TARGETS+=$(TARGET_DIR)/boot/busybox.config
+endif
+endif
+# -----------------------------------------------------------------------------
+
+$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
+ifneq ($(LINUX26_PATCH_SOURCE),)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX26_PATCH_SOURCE)
+endif
+ifneq ($(LINUX26_BSP_PATCH),)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX26_BSP_PATCH)
+endif
+	toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
+ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/ipmi \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
+endif
+ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/lzma \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
+endif
+ifeq ($(BR2_KERNEL_HEADERS_RT),y)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
+endif
+ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
+	if [ -d $(KERNEL_HEADERS_PATCH_DIR) ] ; then \
+	toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} \
+	fi
+endif
+ifeq ($(BR2_PACKAGE_OPENSWAN),y)
+	toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
+endif
+ifneq ($(LINUX26_PATCH_DIR),)
+	if [ -d $(LINUX26_PATCH_DIR) ] ; then \
+		toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) linux-$(LINUX26_VERSION)-\*.patch ; \
+	fi
+endif
+	touch $@
+
+# -----------------------------------------------------------------------------
+$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG)
+ifeq ($(BR2_PACKAGE_LINUX_USE_DEFCONFIG),y)
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig 
+endif
+ifeq ($(BR2_PACKAGE_LINUX_USE_XCONFIG),y)
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig 
+endif
+ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
+	cp -dpf $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
+endif
+	$(SED) '/CONFIG_AEABI=y/d' $(LINUX26_DIR)/.config
+ifeq ($(BR2_ARM_EABI),y)
+	echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config
+	$(SED) '/CONFIG_OABI_COMPAT/d' $(LINUX26_DIR)/.config
+	echo "# CONFIG_OABI_COMPAT is not set" >> $(LINUX26_DIR)/.config
+else
+	echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config
+endif
+	$(SED) '/CONFIG_IPV6=y/d' $(LINUX26_DIR)/.config
+ifeq ($(BR2_INET_IPV6),y)
+	echo "CONFIG_IPV6=y" >> $(LINUX26_DIR)/.config
+else
+	echo "# CONFIG_IPV6 is not set" >> $(LINUX26_DIR)/.config
+endif
+	$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+	$(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+	echo "CONFIG_INITRAMFS_SOURCE=\"$(INITRAMFS_TARGET)\"" >> \
+		$(LINUX26_DIR)/.config
+	echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
+	echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+else
+	echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
+endif
+ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
+	# precedence for a small initramfs
+	$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+	$(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
+	echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
+		$(LINUX26_DIR)/.config
+	echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
+	echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+endif
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
+	touch $@
+
+# -----------------------------------------------------------------------------
+$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
+	touch $@
+
+$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
+		$(LINUX26_DIR)/.depend_done
+	$(MAKE) $(LINUX26_MAKE_FLAGS) \
+		-C $(LINUX26_DIR) $(LINUX26_FORMAT)
+	cp -dpf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
+	touch -c $@
+
+# -----------------------------------------------------------------------------
+$(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_DIR)/.configured
+	rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)
+	rm -f $(TARGET_DIR)/sbin/cardmgr
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
+		DEPMOD=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 \
+		INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
+	rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/build
+	rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/source
+	$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 -b $(TARGET_DIR) $(LINUX_HEADERS_VERSION)
+	touch -c $@
+
+linux26-menuconfig: $(LINUX26_DIR)/.patched host-sed
+	[ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
+	-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
+
+linux26-xconfig: $(LINUX26_DIR)/.patched host-sed
+	[ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
+	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig
+	-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
+
+$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
+	mkdir -p $(TARGET_DIR)/boot
+	cp -dpf $(LINUX26_KERNEL) $(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME)
+
+$(TARGET_DIR)/boot/buildroot.config: .config
+	mkdir -p $(TARGET_DIR)/boot
+	cp -dpf .config $(TARGET_DIR)/boot/buildroot.config
+
+$(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config: $(LINUX26_DIR)/.config
+	mkdir -p $(TARGET_DIR)/boot
+	cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config
+
+$(TARGET_DIR)/boot/uclibc.config: .$(UCLIBC_DIR)/.config
+	mkdir -p $(TARGET_DIR)/boot
+	cp -dpf $(UCLIBC_DIR)/.config $(TARGET_DIR)/boot/uclibc.config
+
+$(TARGET_DIR)/boot/busybox.config: $(BUSYBOX_DIR)/.config
+	mkdir -p $(TARGET_DIR)/boot
+	cp -dpf .config $(TARGET_DIR)/boot/busybox.config
+
+/tftpboot/$(LINUX_KERNEL_NAME): $(LINUX26_KERNEL)
+	mkdir -p /tftpboot
+	cp -dpf $(LINUX26_KERNEL) /tftpboot/$(LINUX_KERNEL_NAME)
+
+$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
+	mkdir -p $(LINUX_COPYTO)
+	cp -dpf $(LINUX26_KERNEL) $(LINUX_COPYTO)/$(LINUX_KERNEL_NAME)
+
+linux26: $(LINUX26_TARGETS)
+
+$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
+	touch $@
+
+linux26-modules: cross-depmod26 $(LINUX26_DIR)/.modules_installed
+
+linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
+
+linux26-unpacked: $(LINUX26_DIR)/.patched
+
+linux26-config: host-sed $(LINUX26_DIR)/.configured
+
+linux26-update:
+	cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
+
+# This has been renamed so we do _NOT_ by default run this on 'make clean'
+linux26clean:
+	rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured
+	-$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
+
+linux26-dirclean:
+	rm -rf $(LINUX26_DIR)
+
+linux-status:
+	@echo PROJECT_BUILD_DIR=$(PROJECT_BUILD_DIR)
+	@echo BOARD_NAME=$(BOARD_NAME)
+	@echo BR2_BOARD_PATH=$(BR2_BOARD_PATH)
+	@echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
+	@echo LINUX26_VERSION=$(LINUX26_VERSION)
+	@echo LINUX26_SOURCE=$(LINUX26_SOURCE)
+	@echo LINUX26_DIR=$(LINUX26_DIR)
+	@echo TARGETS=$(TARGETS)
+	@echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR)
+	@echo LINUX26_BINLOC=$(LINUX26_BINLOC)
+	@echo LINUX26_FORMAT=$(LINUX26_FORMAT)
+	@echo LINUX26_KERNEL=$(LINUX26_KERNEL)
+	@echo BR2_KERNEL_SITE=$(BR2_KERNEL_SITE)
+	@echo BR2_KERNEL_PATCH_SITE=$(BR2_KERNEL_PATCH_SITE)
+	@echo BR2_KERNEL_PATCH=$(BR2_KERNEL_PATCH)
+	@echo BR2_LINUX26_CUSTOM=$(BR2_LINUX26_CUSTOM)
+	@echo BR2_CUSTOM_LINUX26_PATCH_SITE=$(BR2_CUSTOM_LINUX26_PATCH_SITE)
+	@echo BR2_CUSTOM_LINUX26_PATCH=$(BR2_CUSTOM_LINUX26_PATCH)
+	@echo BR2_LINUX_BSP_PATCH=$(BR2_LINUX_BSP_PATCH)
+	@echo BR2_PACKAGE_LINUX_USE_KCONFIG=$(BR2_PACKAGE_LINUX_USE_KCONFIG)
+	@echo BR2_PACKAGE_LINUX_USE_DEFCONFIG=$(BR2_PACKAGE_LINUX_USE_DEFCONFIG)
+	@echo BR2_PACKAGE_LINUX_USE_XCONFIG=$(BR2_PACKAGE_LINUX_USE_XCONFIG)
+	@echo BR2_PACKAGE_LINUX_KCONFIG=$(BR2_PACKAGE_LINUX_KCONFIG)
+	@echo BR2_LINUX_COPYTO_ROOTFS=$(BR2_LINUX_COPYTO_ROOTFS)
+	@echo BR2_LINUX_COPYTO_TFTPBOOT=$(BR2_LINUX_COPYTO_TFTPBOOT=)
+	@echo BR2_LINUX_COPYTO=$(BR2_LINUX_COPYTO)
+	@echo BR2_KERNEL_MINORLEVEL=$(BR2_KERNEL_MINORLEVEL)
+	@echo LINUX26_LATEST_RC_PATCH=$(LINUX26_LATEST_RC_PATCH)
+	@echo BR2_KERNEL_RC_LEVEL=$(BR2_KERNEL_RC_LEVEL)
+	@echo LINUX26_LATEST_MM_PATCH=$(LINUX26_LATEST_MM_PATCH)
+	@echo BR2_KERNEL_MM_LEVEL=$(BR2_KERNEL_MM_LEVEL)
+	@echo LINUX26_LATEST_GIT_PATCH=$(LINUX26_LATEST_GIT_PATCH)
+	@echo BR2_KERNEL_GIT_LEVEL=$(BR2_KERNEL_GIT_LEVEL)
+
+
+endif
author	Ulf Samuelsson	2007-10-13 20:30:28 +0200
committer	Ulf Samuelsson	2007-10-13 20:30:28 +0200
commit	453dca995ee437b2f6fc3e0a6e4e2b4317346dae (patch)
tree	cb581b1c418560e1a8c0a062f09f6b2df8e82911
parent	Update AVR32 toolchain with new binutils and uClibc, This time it works (cros... (diff)
download	buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.tar.gz buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.tar.xz buildroot-453dca995ee437b2f6fc3e0a6e4e2b4317346dae.zip