Remove duplicate AVR32 patches, and add support for ARCH and conditional AVR32 patches

1 files changed, 179 insertions, 135 deletions

diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
index fe8bb89ca..192fc9e84 100644
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Mon Mar 17 22:02:39 2008
+# Sat Mar 29 23:43:32 2008
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="0.10.0-svn"
@@ -58,7 +58,7 @@ BR2_BANNER="Welcome to the Erik's uClibc development environment running on the
 #
 # Preset Devices
 #
-# BR2_TARGET_ARM is not set
+# BR2_TARGET_ARMLTD is not set
 BR2_TARGET_ATMEL=y
 
 #
@@ -111,6 +111,10 @@ BR2_TARGET_AT91BOOTSTRAP_MEMORY="dataflashcard"
 # BR2_TARGET_SHARP is not set
 
 #
+# Generic Architecture support
+#
+
+#
 # Generic System Support
 #
 # BR2_TARGET_GENERIC_ACCESS_POINT is not set
@@ -196,17 +200,13 @@ BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
 # BR2_KERNEL_HEADERS_2_6_20 is not set
 # 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_1 is not set
 # 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_2_6_24 is not set
+BR2_KERNEL_HEADERS_2_6_24=y
 # 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"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.24"
 
 #
 # uClibc Options
@@ -215,7 +215,7 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.22.1"
 BR2_UCLIBC_VERSION_0_9_29=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
-# BR2_ENABLE_LOCALE is not set
+BR2_ENABLE_LOCALE=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -281,8 +281,8 @@ BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
 # BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
-# BR2_INET_IPV6 is not set
-# BR2_INET_RPC is not set
+BR2_INET_IPV6=y
+BR2_INET_RPC=y
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -296,30 +296,24 @@ BR2_PACKAGE_BUSYBOX=y
 # BR2_BUSYBOX_VERSION_1_6_1 is not set
 # BR2_BUSYBOX_VERSION_1_7_X is not set
 # BR2_BUSYBOX_VERSION_1_8_X is not set
-BR2_BUSYBOX_VERSION_1_9_X=y
+# BR2_BUSYBOX_VERSION_1_9_X is not set
+BR2_BUSYBOX_VERSION_1_10_X=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.9.1"
-BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
+BR2_BUSYBOX_VERSION="1.10.0"
+BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
 #
-# BR2_PACKAGE_BASH is not set
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_COREUTILS is not set
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BZIP2=y
 # BR2_PACKAGE_DIFFUTILS is not set
-# BR2_PACKAGE_FINDUTILS is not set
 # BR2_PACKAGE_FLEX is not set
-# BR2_PACKAGE_GAWK is not set
 # BR2_PACKAGE_GCC_TARGET is not set
-# BR2_PACKAGE_GREP is not set
 # BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_PATCH is not set
-# BR2_PACKAGE_SED is not set
-# BR2_PACKAGE_TAR is not set
 
 #
 # Other development stuff
@@ -333,19 +327,22 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
 BR2_HOST_FAKEROOT=y
-# BR2_PACKAGE_GETTEXT is not set
-# BR2_PACKAGE_LIBINTL is not set
+BR2_PACKAGE_GETTEXT=y
+# BR2_PACKAGE_GETTEXT_STATIC is not set
+BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
 # BR2_PACKAGE_LIBMPFR is not set
 # BR2_PACKAGE_LIBTOOL is not set
 # BR2_PACKAGE_M4 is not set
 # BR2_PACKAGE_PKGCONFIG is not set
-# BR2_READLINE is not set
+BR2_READLINE=y
+BR2_PACKAGE_READLINE_TARGET=y
+# BR2_PACKAGE_READLINE_HEADERS is not set
 
 #
 # Other stuff
 #
-# BR2_PACKAGE_AT is not set
+BR2_PACKAGE_AT=y
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_BSDIFF is not set
 # BR2_PACKAGE_CUPS is not set
@@ -356,56 +353,46 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_IPKG 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_LIBEVENT=y
 # 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_LIBLOCKFILE=y
 # BR2_PACKAGE_LIBSYSFS is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
+BR2_PACKAGE_LOCKFILE_PROGS=y
 # 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_MODULE_INIT_TOOLS is not set
-# BR2_PACKAGE_MODUTILS is not set
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_PORTAGE is not set
-# BR2_PACKAGE_PROCPS is not set
-# BR2_PACKAGE_PSMISC is not set
 # BR2_PACKAGE_SQLITE is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 # BR2_PACKAGE_STRACE is not set
 # BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_SYSKLOGD is not set
-# BR2_PACKAGE_SYSVINIT is not set
-# BR2_PACKAGE_TINYLOGIN is not set
-# BR2_PACKAGE_UTIL-LINUX is not set
-# BR2_PACKAGE_WHICH is not set
-# BR2_TEXTEDIT_SUPPORT is not set
 BR2_NETWORK_SUPPORT=y
 
 #
 # Networking applications
 #
-
-#
-# argus		- disabled (requires libpcap)
-#
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_BOA is not set
+# BR2_PACKAGE_ARGUS is not set
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_AUTOIPD=y
+# BR2_PACKAGE_AVAHI_DAEMON is not set
+BR2_PACKAGE_BOA=y
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_CURL is not set
 # BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_ISC_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
-# BR2_PACKAGE_HASERL is not set
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_HASERL=y
+# BR2_PACKAGE_HASERL_VERSION_0_8_0 is not set
+BR2_PACKAGE_HASERL_VERSION_0_9_22=y
+BR2_PACKAGE_HASERL_VERSION="0.9.22"
 # BR2_PACKAGE_IRDA_UTILS is not set
 # BR2_PACKAGE_IPERF is not set
 # BR2_PACKAGE_IPROUTE2 is not set
@@ -415,29 +402,42 @@ BR2_NETWORK_SUPPORT=y
 #
 # BR2_PACKAGE_IPTABLES is not set
 # BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_L2TP is not set
+BR2_PACKAGE_L2TP=y
 # BR2_PACKAGE_LIBCGI is not set
 # BR2_PACKAGE_LIBCGICC is not set
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
-# BR2_PACKAGE_LIBPCAP is not set
+BR2_PACKAGE_LIBPCAP=y
 # BR2_PACKAGE_LINKS is not set
-# BR2_PACKAGE_LRZSZ is not set
+BR2_PACKAGE_LRZSZ=y
 # BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MICROCOM is not set
+BR2_PACKAGE_MICROCOM=y
 # 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
+BR2_PACKAGE_NCFTP=y
+
+#
+# ncFTP tools selection
+#
+BR2_PACKAGE_NCFTP_GET=y
+BR2_PACKAGE_NCFTP_PUT=y
+BR2_PACKAGE_NCFTP_LS=y
+BR2_PACKAGE_NCFTP_BATCH=y
+# BR2_PACKAGE_NCFTP_SPOOLER is not set
+# BR2_PACKAGE_NCFTP_BOOKMARKS is not set
 # BR2_PACKAGE_NETKITBASE is not set
 # BR2_PACKAGE_NETKITTELNET is not set
-# BR2_PACKAGE_NETPLUG is not set
+BR2_PACKAGE_NETPLUG=y
 # BR2_PACKAGE_NETSNMP is not set
+BR2_PACKAGE_NFS_UTILS=y
 
 #
-# nfs-utils requires a toolchain with 'Enable RPC' selected
+# NFS utilities selection
 #
+# BR2_PACKAGE_NFS_UTILS_RPCDEBUG is not set
+# BR2_PACKAGE_NFS_UTILS_RPC_LOCKD is not set
+# BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD is not set
 # BR2_PACKAGE_NTP is not set
 # BR2_PACKAGE_OLSR is not set
 # BR2_PACKAGE_OPENNTPD is not set
@@ -445,12 +445,9 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_OPENSSL is not set
 # BR2_PACKAGE_OPENVPN is not set
 # BR2_PACKAGE_OPENSWAN is not set
-
-#
-# portmap requires a toolchain with 'Enable RPC' selected
-#
-# BR2_PACKAGE_PPPD is not set
-# BR2_PACKAGE_RP_PPPOE is not set
+BR2_PACKAGE_PORTMAP=y
+BR2_PACKAGE_PPPD=y
+BR2_PACKAGE_RP_PPPOE=y
 # BR2_PACKAGE_PPTP_LINUX is not set
 # BR2_PACKAGE_PROFTPD is not set
 # BR2_PACKAGE_QUAGGA is not set
@@ -463,33 +460,58 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_QUAGGA_RIPD is not set
 # BR2_PACKAGE_QUAGGA_RIPNGD is not set
 # BR2_PACKAGE_QUAGGA_OSPFD is not set
+# BR2_PACKAGE_QUAGGA_OSPF6D is not set
 # BR2_PACKAGE_QUAGGA_WATCHQUAGGA is not set
 # BR2_PACKAGE_QUAGGA_ISISD is not set
-# BR2_PACKAGE_RSYNC is not set
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SOCAT is not set
+BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SAMBA=y
+
+#
+# Samba tools selection
+#
+BR2_PACKAGE_SAMBA_CIFS=y
+BR2_PACKAGE_SAMBA_EVENTLOGADM=y
+BR2_PACKAGE_SAMBA_NET=y
+BR2_PACKAGE_SAMBA_NMBD=y
+BR2_PACKAGE_SAMBA_NMBLOOKUP=y
+BR2_PACKAGE_SAMBA_NTLM_AUTH=y
+BR2_PACKAGE_SAMBA_PDBEDIT=y
+BR2_PACKAGE_SAMBA_PROFILES=y
+BR2_PACKAGE_SAMBA_RPCCLIENT=y
+BR2_PACKAGE_SAMBA_SMBCACLS=y
+BR2_PACKAGE_SAMBA_SMBCLIENT=y
+BR2_PACKAGE_SAMBA_SMBCONTROL=y
+BR2_PACKAGE_SAMBA_SMBCQUOTAS=y
+BR2_PACKAGE_SAMBA_SMBGET=y
+BR2_PACKAGE_SAMBA_SMBPASSWD=y
+BR2_PACKAGE_SAMBA_SMBSPOOL=y
+BR2_PACKAGE_SAMBA_SMBSTATUS=y
+BR2_PACKAGE_SAMBA_SMBTREE=y
+BR2_PACKAGE_SAMBA_SWAT=y
+BR2_PACKAGE_SAMBA_TDB=y
+BR2_PACKAGE_SAMBA_TESTPARM=y
+BR2_PACKAGE_SAMBA_WINBINDD=y
+BR2_PACKAGE_SAMBA_WBINFO=y
+BR2_PACKAGE_SOCAT=y
 # 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_TFTPD=y
 # BR2_PACKAGE_TN5250 is not set
 # BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_UDPCAST is not set
 
 #
 # vpnc		- disabled (requires libgcrypt and libgpg_error)
 #
 # BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WGET is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 BR2_BLOCKDEV_SUPPORT=y
-
-#
-# dbus not available (need expat or libxml2)
-#
-# BR2_PACKAGE_DM is not set
+BR2_PACKAGE_DBUS=y
+BR2_DBUS_EXPAT=y
+# BR2_DBUS_LIBXML2 is not set
+# BR2_PACKAGE_DBUS_GLIB is not set
+BR2_PACKAGE_DM=y
 # BR2_PACKAGE_DMRAID is not set
 # BR2_PACKAGE_E2FSPROGS is not set
 # BR2_PACKAGE_FCONFIG is not set
@@ -497,58 +519,54 @@ BR2_BLOCKDEV_SUPPORT=y
 # BR2_PACKAGE_LIBFUSE 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_LIBUSB=y
 # 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_MKDOSFS=y
 BR2_PACKAGE_MTD=y
 # 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
-BR2_PACKAGE_MTD_ORIG_STRING="mtd_20061007.orig.tar.gz"
+# BR2_PACKAGE_MTD_UTILS_GIT is not set
 
 #
 # MTD tools selection
 #
+BR2_PACKAGE_MTD_DOCFDISK=y
+BR2_PACKAGE_MTD_DOC_LOADBIOS=y
+BR2_PACKAGE_MTD_FLASHCP=y
 BR2_PACKAGE_MTD_FLASH_ERASE=y
 BR2_PACKAGE_MTD_FLASH_ERASEALL=y
 BR2_PACKAGE_MTD_FLASH_INFO=y
 BR2_PACKAGE_MTD_FLASH_LOCK=y
 BR2_PACKAGE_MTD_FLASH_UNLOCK=y
-BR2_PACKAGE_MTD_FLASHCP=y
-BR2_PACKAGE_MTD_ERASE=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_MTD_FTL_CHECK=y
 BR2_PACKAGE_MTD_FTL_FORMAT=y
-BR2_PACKAGE_MTD_NFTL_FORMAT=y
-BR2_PACKAGE_MTD_NFTLDUMP=y
+BR2_PACKAGE_MTD_JFFS2DUMP=y
 BR2_PACKAGE_MTD_MKFSJFFS2=y
 BR2_PACKAGE_MTD_MKFSJFFS=y
+BR2_PACKAGE_MTD_MTD_DEBUG=y
 BR2_PACKAGE_MTD_NANDDUMP=y
 BR2_PACKAGE_MTD_NANDWRITE=y
-BR2_PACKAGE_MTD_MTD_DEBUG=y
-BR2_PACKAGE_MTD_DOCFDISK=y
-BR2_PACKAGE_MTD_DOC_LOADBIOS=y
+BR2_PACKAGE_MTD_NFTL_FORMAT=y
+BR2_PACKAGE_MTD_NFTLDUMP=y
+BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
 # BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_RAIDTOOLS is not set
-# BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SFDISK is not set
+BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_UDEV is not set
-# BR2_PACKAGE_USBMOUNT is not set
-# BR2_PACKAGE_USBUTILS is not set
+BR2_PACKAGE_UDEV_VOLUME_ID=y
+BR2_PACKAGE_UDEV_SCSI_ID=y
+BR2_PACKAGE_USBMOUNT=y
+BR2_PACKAGE_USBUTILS=y
 # BR2_PACKAGE_WIPE is not set
 # BR2_PACKAGE_XFSPROGS is not set
 BR2_AUDIO_SUPPORT=y
@@ -573,7 +591,8 @@ BR2_GRAPHIC_SUPPORT=y
 #
 # text rendering libraries
 #
-# BR2_PACKAGE_NCURSES is not set
+BR2_PACKAGE_NCURSES=y
+# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set
 # BR2_PACKAGE_NEWT is not set
 # BR2_PACKAGE_SLANG is not set
 
@@ -636,6 +655,7 @@ BR2_X11_PREFIX="/usr"
 # BR2_PACKAGE_FONTCONFIG is not set
 # BR2_PACKAGE_FREETYPE is not set
 # BR2_PACKAGE_TSLIB is not set
+# BR2_PACKAGE_WEBKIT is not set
 
 #
 # X Window managers
@@ -649,23 +669,24 @@ BR2_X11_PREFIX="/usr"
 #
 # X applications
 #
+# BR2_PACKAGE_ALSAMIXERGUI is not set
 
 #
 # dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
 #
+# BR2_PACKAGE_DOCKER is not set
+# BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_LEAFPAD is not set
 
 #
 # midori		- disabled (requires Xorg(7))
 #
-# BR2_PACKAGE_WEBKIT is not set
-# BR2_PACKAGE_GQVIEW is not set
-# BR2_PACKAGE_LEAFPAD is not set
-# BR2_PACKAGE_TORSMO is not set
 # BR2_PACKAGE_PCMANFM is not set
-# BR2_PACKAGE_XSTROKE is not set
 # BR2_PACKAGE_SYLPHEED is not set
-# BR2_PACKAGE_XPDF is not set
+# BR2_PACKAGE_TORSMO is not set
 # BR2_PACKAGE_X11VNC is not set
+# BR2_PACKAGE_XPDF is not set
+# BR2_PACKAGE_XSTROKE is not set
 # BR2_PACKAGE_XVKBD is not set
 
 #
@@ -673,32 +694,29 @@ BR2_X11_PREFIX="/usr"
 #
 # BR2_PACKAGE_MPLAYER is not set
 BR2_COMPRESSOR_SUPPORT=y
-# BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
 # BR2_PACKAGE_LZMA_TARGET is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
 BR2_SCRIPTING_SUPPORT=y
-
-#
-# lua		- disabled (requires readline and ncurses)
-#
+# BR2_PACKAGE_LUA is not set
 # BR2_PACKAGE_MICROPERL is not set
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_RUBY is not set
 # BR2_PACKAGE_TCL is not set
 # BR2_PACKAGE_PHP is not set
+BR2_XML_SUPPORT=y
+BR2_PACKAGE_EXPAT=y
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_LIBXML2 is not set
 
 #
-# PHP Extensions
-#
-
-#
-# Database extensions
+# libxslt	- disabled (requires pkgconfig)
 #
-# BR2_XML_SUPPORT is not set
-# BR2_JAVA_SUPPORT is not set
+# BR2_PACKAGE_XERCES is not set
+BR2_JAVA_SUPPORT=y
+# BR2_PACKAGE_CLASSPATH is not set
 BR2_GAMES=y
 # BR2_PACKAGE_LXDOOM is not set
 # BR2_PACKAGE_LXDOOM_WAD is not set
@@ -727,7 +745,7 @@ BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -744,7 +762,7 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
 BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set
 # BR2_TARGET_ROOTFS_CPIO is not set
@@ -762,34 +780,60 @@ BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
 # BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
-BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config"
-BR2_PACKAGE_LINUX_FORMAT="vmlinux"
-BR2_KERNEL_CURRENT_VERSION="2.6.24"
+BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
+BR2_PACKAGE_LINUX_FORMAT="uImage"
+BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
+BR2_KERNEL_CURRENT_VERSION="2.6.24.4"
+BR2_KERNEL_NEXT_VERSION="2.6.25"
+BR2_KERNEL_THIS_VERSION="2.6.24"
 BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(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)"
+BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 # BR2_LINUX_2_6_STABLE is not set
-# BR2_LINUX_2_6_24 is not set
+BR2_LINUX_2_6_24=y
 # 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_1 is not set
 # BR2_LINUX_2_6_22 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 is not set
+# BR2_LINUX_2_6_25 is not set
 # BR2_LINUX26_CUSTOM is not set
 
 #
 # Patches
 #
-# BR2_KERNEL_ADD_PATCH is not set
-BR2_LINUX_BSP_PATCH="linux-2.6.20.4-atmel.patch.bz2"
-BR2_KERNEL_PREPATCHED=y
-# BR2_KERNEL_BASE is not set
+BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
+# BR2_KERNEL_ADD_LATEST is not set
+# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
+BR2_KERNEL_ADD_MINORPATCH=y
+# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
+# BR2_KERNEL_ADD_RC_PATCH is not set
+# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set
+# BR2_KERNEL_ADD_SNAPSHOT is not set
+# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
+# BR2_KERNEL_ADD_MM_PATCH is not set
+BR2_KERNEL_ADD_PATCH=y
+BR2_KERNEL_MINORLEVEL="4"
+BR2_KERNEL_ARCH_PATCH_ENABLED=y
+BR2_ARCH_AT91_2_6_24=y
+# BR2_ARCH_AT91_2_6_22_1 is not set
+# BR2_ARCH_AT91_2_6_21_5 is not set
+# BR2_ARCH_AT91_2_6_21_1 is not set
+# BR2_ARCH_AT91_2_6_20_4 is not set
+BR2_KERNEL_ARCH_PATCH_VERSION="2.6.24"
+BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
+BR2_LINUX_BOARD_PATCH=y
+BR2_LINUX_BSP_PATCH=""
+BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
+# BR2_KERNEL_PREPATCHED is not set
+BR2_KERNEL_BASE=y
 # BR2_KERNEL_LATEST is not set
-BR2_DOWNLOAD_LINUX26_VERSION="2.6.22.1"
-BR2_LINUX26_VERSION="2.6.22.1"
+BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
+BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
 
 #
 # Linux Kernel Configuration
@@ -798,8 +842,8 @@ BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # 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_UIMAGE is not set
-BR2_LINUX_BIN_VMLINUX=y
+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
 
@@ -808,5 +852,5 @@ BR2_LINUX_BIN_VMLINUX=y
 #
 # BR2_LINUX_COPYTO_ROOTFS is not set
 BR2_LINUX_COPYTO_TFTPBOOT=y
-BR2_LINUX_COPYTO="/tftpboot"
+BR2_LINUX_COPYTO=""
 BR2_LINUX_COPY_CONFIGURATION=y