19 files changed, 351 insertions, 595 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4bb27afa51..4f94ddb30f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -10,9 +10,10 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
-	${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
-        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+		 base##${ANGSTROM_URI}/unstable/feed/base/"
+#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
+#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
+#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 #CVSDATE = 20050331
 
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index a68adaae42..916b14d9b9 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -31,8 +31,8 @@ TARGET_FPU = "soft"
 
 PARALLEL_INSTALL_MODULES = "1"
 
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index f05dd23e81..dec59f9f68 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -45,6 +45,7 @@ ${PKGDIR}/packages/dropbear/*.bb \
 ${PKGDIR}/packages/dsniff/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
 ${PKGDIR}/packages/e2fsprogs-libs/*.bb \
+${PKGDIR}/packages/eciadsl/*.bb \
 ${PKGDIR}/packages/expat/*.bb \
 ${PKGDIR}/packages/ez-ipupdate/*.bb \
 ${PKGDIR}/packages/fakeroot/*.bb \
@@ -72,6 +73,7 @@ ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hal/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
+${PKGDIR}/packages/icecast/*.bb \
 ${PKGDIR}/packages/ifupdown/*.bb \
 ${PKGDIR}/packages/initscripts/*.bb \
 ${PKGDIR}/packages/install/*.bb \
@@ -112,6 +114,7 @@ ${PKGDIR}/packages/libtool/*.bb \
 ${PKGDIR}/packages/libusb/*.bb \
 ${PKGDIR}/packages/libvorbis/*.bb \
 ${PKGDIR}/packages/libxml/*.bb \
+${PKGDIR}/packages/libxslt/* \
 ${PKGDIR}/packages/linux-libc-headers/*.bb \
 ${PKGDIR}/packages/linux/*.bb \
 ${PKGDIR}/packages/lirc/*.bb \
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 1289fb4505..1fb3b2894c 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -22,7 +22,8 @@ SERIAL_CONSOLE = "57600 ttyAM0"
 
 # used by some images
 ROOT_FLASH_SIZE = "8"
-
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
 #can be used for crunch support later on
diff --git a/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb
index 3dc386f0e9..e6ce5337ae 100644
--- a/packages/binutils/binutils_csl-arm-20050416.bb
+++ b/packages/binutils/binutils_csl-arm-20050416.bb
@@ -10,8 +10,8 @@ PV = "2.15.99+csl-arm+cvs20050416"
 PR = "r0"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_arm-linux = "1"
-DEFAULT_PREFERENCE_arm-linuxeabi = "1"
+DEFAULT_PREFERENCE_arm-linux = "-1"
+DEFAULT_PREFERENCE_arm-linuxeabi = "-1"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
diff --git a/packages/dbus/dbus_0.61.inc b/packages/dbus/dbus_0.61.inc
index 70546ed5b1..c1dcc0e4a3 100644
--- a/packages/dbus/dbus_0.61.inc
+++ b/packages/dbus/dbus_0.61.inc
@@ -38,7 +38,7 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 }
 
-EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
+EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
 		--with-xml=expat --without-x"
 
diff --git a/packages/eciadsl/.mtn2git_empty b/packages/eciadsl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eciadsl/.mtn2git_empty
diff --git a/packages/eciadsl/eciadsl_0.11.bb b/packages/eciadsl/eciadsl_0.11.bb
new file mode 100644
index 0000000000..2d0efe34a6
--- /dev/null
+++ b/packages/eciadsl/eciadsl_0.11.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "eciadsl is a usermode driver for GlobeSpan-based ADSL modems"
+SECTION = "net"
+SRC_URI = "http://eciadsl.flashtux.org/download/eciadsl-usermode-${PV}.tar.gz \
+           file://eciadsl-bash.patch;patch=1"
+LICENSE = "GPL"
+RDEPENDS = "bash kernel-module-n_hdlc ppp grep"
+S = "${WORKDIR}/eciadsl-usermode-${PV}"
+
+inherit autotools
diff --git a/packages/eciadsl/files/.mtn2git_empty b/packages/eciadsl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eciadsl/files/.mtn2git_empty
diff --git a/packages/eciadsl/files/eciadsl-bash.patch b/packages/eciadsl/files/eciadsl-bash.patch
new file mode 100644
index 0000000000..3c4334f277
--- /dev/null
+++ b/packages/eciadsl/files/eciadsl-bash.patch
@@ -0,0 +1,135 @@
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-config-text eciadsl-usermode-0..11/eciadsl-config-text
+--- eciadsl-usermode-0.11-old/eciadsl-config-text	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-config-text	2006-03-03 10:26:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # EciAdsl Linux driver configuration script.
+ # Same goal as eciadsl-config-tk, but can be run in a terminal / console.
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-config-text.in eciadsl-usermode-0.11/eciadsl-config-text.in
+--- eciadsl-usermode-0.11-old/eciadsl-config-text.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-config-text.in	2006-03-03 10:26:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # EciAdsl Linux driver configuration script.
+ # Same goal as eciadsl-config-tk, but can be run in a terminal / console.
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-doctor eciadsl-usermode-0.11/eciadsl-doctor
+--- eciadsl-usermode-0.11-old/eciadsl-doctor	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-doctor	2006-03-03 10:27:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author: Benoit PAPILLAULT <benoit.papillault@free.fr>
+ # Creation: 01/02/2002
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-doctor.in eciadsl-usermode-0.11/eciadsl-doctor.in
+--- eciadsl-usermode-0.11-old/eciadsl-doctor.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-doctor.in	2006-03-03 10:27:01.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author: Benoit PAPILLAULT <benoit.papillault@free.fr>
+ # Creation: 01/02/2002
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-makeconfig eciadsl-usermode-0.11/eciadsl-makeconfig
+--- eciadsl-usermode-0.11-old/eciadsl-makeconfig	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-makeconfig	2006-03-03 10:27:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-makeconfig - EciAdsl Linux driver configuration script     *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-makeconfig.in eciadsl-usermode-0.11/eciadsl-makeconfig.in
+--- eciadsl-usermode-0.11-old/eciadsl-makeconfig.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-makeconfig.in	2006-03-03 10:27:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-makeconfig - EciAdsl Linux driver configuration script     *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-probe-device eciadsl-usermode-0.11/eciadsl-probe-device
+--- eciadsl-usermode-0.11-old/eciadsl-probe-device	2004-11-06 13:47:05.000000000 +0000
++++ eciadsl-usermode-0.11/eciadsl-probe-device	2006-03-03 10:27:28.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author : wwp <subscript@free.fr>
+ # Creation : 2002/10/16
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-probe-synch eciadsl-usermode-0..11/eciadsl-probe-synch
+--- eciadsl-usermode-0.11-old/eciadsl-probe-synch	2004-12-28 19:16:58.000000000 +0000
++++ eciadsl-usermode-0.11/eciadsl-probe-synch	2006-03-03 10:27:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # probe device's VIDs and PIDs
+ 
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-remove-dabusb eciadsl-usermode-0.11/eciadsl-remove-dabusb
+--- eciadsl-usermode-0.11-old/eciadsl-remove-dabusb	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-remove-dabusb	2006-03-03 10:27:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-remove-dabusb v0.1 - dabusb destroyer script               *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-remove-dabusb.in eciadsl-usermode-0.11/eciadsl-remove-dabusb.in
+--- eciadsl-usermode-0.11-old/eciadsl-remove-dabusb.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-remove-dabusb.in	2006-03-03 10:27:51.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-remove-dabusb v0.1 - dabusb destroyer script               *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-start eciadsl-usermode-0.11/eciadsl-start
+--- eciadsl-usermode-0.11-old/eciadsl-start	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-start	2006-03-03 10:31:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Author   : Jean-Sebastien VALETTE <jean-sebastien.valette@libertysurf.fr>
+ # Creation : 06/12/2001
+@@ -543,7 +543,7 @@
+ case "$mode" in
+ "VCM_RFC2364"|"LLC_RFC2364")
+ 
+-    nice --20 pppd call adsl updetach
++    nice -n-20 pppd call adsl updetach
+     if [ $? -ne 0 ]; then
+         echo "ERROR: failed to connect"
+         exit $STEP
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-start.in eciadsl-usermode-0.11/eciadsl-start.in
+--- eciadsl-usermode-0.11-old/eciadsl-start.in	2005-09-24 09:42:15.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-start.in	2006-03-03 10:31:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Author   : Jean-Sebastien VALETTE <jean-sebastien.valette@libertysurf.fr>
+ # Creation : 06/12/2001
+@@ -543,7 +543,7 @@
+ case "$mode" in
+ "VCM_RFC2364"|"LLC_RFC2364")
+ 
+-    nice --20 @pppdpath@ call adsl updetach
++    nice -n20 @pppdpath@ call adsl updetach
+     if [ $? -ne 0 ]; then
+         echo "ERROR: failed to connect"
+         exit $STEP
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-stop eciadsl-usermode-0.11/eciadsl-stop
+--- eciadsl-usermode-0.11-old/eciadsl-stop	2005-06-11 08:05:46.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-stop	2006-03-03 10:28:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # eciadsl-stop: stop EciAdsl connection
+ #
diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb
index c4c89f365d..7b6ba73b01 100644
--- a/packages/icecast/icecast_2.2.0.bb
+++ b/packages/icecast/icecast_2.2.0.bb
@@ -1,10 +1,15 @@
-PR = "r2"
+PR = "r3"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 LICENSE = "GPL-2"
 
 DEPENDS = "libvorbis libogg libxslt"
 
+# The RDEPENDS line is a workaround to make sure
+# icecast pulls in necessary library deps.
+RDEPENDS = "libvorbis libogg libxslt"
+
 SRC_URI = "http://downloads.us.xiph.org/releases/icecast/${PN}-${PV}.tar.gz"
+EXTRA_OECONF = "--with-ogg=${STAGING_LIBDIR} --with-vorbis=${STAGING_LIBDIR}"
 
 S = "${WORKDIR}/${PN}-${PV}"
 inherit autotools
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig
index 9487031705..de1f91e6fa 100644
--- a/packages/linux/ep93xx-kernel/defconfig
+++ b/packages/linux/ep93xx-kernel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15
-# Thu Feb  9 20:06:27 2006
+# Linux kernel version: 2.6.15.2
+# Fri Mar  3 15:13:04 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -13,10 +13,8 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
+CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -24,7 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -36,7 +34,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -72,14 +70,14 @@ CONFIG_KMOD=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=m
-CONFIG_IOSCHED_DEADLINE=m
-CONFIG_IOSCHED_CFQ=m
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
 
 #
 # System Type
@@ -110,19 +108,14 @@ CONFIG_ARCH_EP93XX=y
 # CONFIG_ARCH_AAEC2000 is not set
 
 #
-# EP93xx
+# Cirrus EP93xx Implementation Options
 #
-# CONFIG_ARCH_EP9301 is not set
-# CONFIG_ARCH_EP9302 is not set
-CONFIG_ARCH_EP9312=y
-# CONFIG_ARCH_EP9315 is not set
-CONFIG_MACH_EDB9312=y
-# CONFIG_MACH_ACC is not set
-# CONFIG_ARCH_EP93XX_GPIO_IRQ is not set
-CONFIG_EP93XX_DMA=y
-CONFIG_EP93XX_SSP=y
-CONFIG_EP93XX_SSP_CIRRUS=y
-# CONFIG_EP93XX_SSP_LINUX is not set
+
+#
+# EP93xx Platforms
+#
+CONFIG_MACH_GESBC9312=y
+CONFIG_MACH_TS72XX=y
 
 #
 # Processor Type
@@ -143,6 +136,7 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+CONFIG_ARM_VIC=y
 
 #
 # Bus support
@@ -153,35 +147,22 @@ CONFIG_ISA_DMA_API=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-
-#
-# PC-card bridges
-#
-# CONFIG_PCMCIA_EP93XX is not set
+# CONFIG_PCCARD is not set
 
 #
 # Kernel Features
 #
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM=y
+CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_LEDS=y
-CONFIG_LEDS_TIMER=y
-CONFIG_LEDS_CPU=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -189,7 +170,8 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/hda1"
+#CONFIG_CMDLINE="console=ttyAM0,57600 root=/dev/sda2 rootfstype=ext3 rootdelay=12"
+CONFIG_CMDLINE="console=ttyAM0,57600 root=/dev/mtdblock1 rootfstype=jffs2"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -200,24 +182,21 @@ CONFIG_CMDLINE="root=/dev/hda1"
 # At least one emulation must be selected
 #
 CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FPE_FASTFPE=y
+CONFIG_FPE_NWFPE_XP=y
+# CONFIG_FPE_FASTFPE is not set
 
 #
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_MISC=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
 # CONFIG_ARTHUR is not set
 
 #
 # Power management options
 #
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_APM=m
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -234,18 +213,17 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
+# CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
 # CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
@@ -254,46 +232,8 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_IPV6_TUNNEL is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NF_CONNTRACK is not set
-
-#
-# IP: Netfilter Configuration
-#
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-
-#
-# Bridge: Netfilter Configuration
-#
-# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
 
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -305,7 +245,7 @@ CONFIG_BRIDGE_NETFILTER=y
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-CONFIG_BRIDGE=m
+# CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
@@ -327,72 +267,8 @@ CONFIG_BRIDGE=m
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-# CONFIG_IRLAN is not set
-# CONFIG_IRNET is not set
-# CONFIG_IRCOMM is not set
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-# CONFIG_IRTTY_SIR is not set
-
-#
-# Dongle support
-#
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-# CONFIG_USB_IRDA is not set
-# CONFIG_SIGMATEL_FIR is not set
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_BT=m
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_SCO is not set
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIUSB is not set
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
 # CONFIG_IEEE80211 is not set
 
 #
@@ -402,9 +278,9 @@ CONFIG_BT=m
 #
 # Generic Driver Options
 #
-# CONFIG_STANDALONE is not set
+CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
+# CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
 
 #
@@ -421,9 +297,9 @@ CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 
 #
@@ -431,19 +307,22 @@ CONFIG_MTD_CMDLINE_PARTS=y
 #
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
-CONFIG_FTL=y
-CONFIG_NFTL=y
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 
 #
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
+# CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -454,39 +333,34 @@ CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_AMDSTD_RETRY=0
 CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_RAM=y
+# CONFIG_MTD_RAM is not set
 CONFIG_MTD_ROM=y
-CONFIG_MTD_ABSENT=y
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_XIP is not set
 
 #
 # Mapping drivers for chip access
 #
-CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x60000000
-CONFIG_MTD_PHYSMAP_LEN=0x02000000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=4
+CONFIG_MTD_PHYSMAP_START=0x600000
+CONFIG_MTD_PHYSMAP_LEN=0x800000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_IMPA7 is not set
-# CONFIG_MTD_PCMCIA is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
-CONFIG_MTD_SLRAM=y
-CONFIG_MTD_PHRAM=y
-CONFIG_MTD_MTDRAM=y
-CONFIG_MTDRAM_TOTAL_SIZE=512
-CONFIG_MTDRAM_ERASE_SIZE=1
-CONFIG_MTDRAM_ABS_POS=0x20000000
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
@@ -500,11 +374,7 @@ CONFIG_MTDRAM_ABS_POS=0x20000000
 #
 # NAND Flash Device Drivers
 #
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND is not set
 
 #
 # OneNAND Flash Device Drivers
@@ -524,71 +394,35 @@ CONFIG_MTD_NAND_IDS=y
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
+# CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=12288
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+# CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 
 #
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_EP93XX=y
-# CONFIG_BLK_DEV_IDEDMA_EP93XX is not set
-CONFIG_IDE_ARM=y
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
+CONFIG_SCSI=y
+# CONFIG_SCSI_PROC_FS is not set
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
 # CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 
@@ -608,34 +442,9 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_DEBUG is not set
 
 #
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
 # Multi-device support (RAID and LVM)
 #
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-# CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_MD is not set
 
 #
 # Fusion MPT device support
@@ -645,7 +454,6 @@ CONFIG_DM_MULTIPATH=m
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
 # I2O device support
@@ -692,38 +500,15 @@ CONFIG_EP93XX_ETHERNET=y
 # CONFIG_NET_RADIO is not set
 
 #
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
-
-#
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-# CONFIG_PPPOE is not set
+# CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 # CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -733,62 +518,18 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 # Input device support
 #
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_EP93XX=y
-CONFIG_KEYBOARD_EP93XX_SPI=y
-CONFIG_KEYBOARD_EP93XX_8X8=y
-# CONFIG_KEYBOARD_EP93XX_8X8_CYCLING is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=y
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-CONFIG_TOUCHSCREEN_EP93XX=y
-# CONFIG_INPUT_MISC is not set
+# CONFIG_INPUT is not set
 
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_AMBAKMI is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
 # Character devices
 #
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
+# CONFIG_VT is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -799,15 +540,13 @@ CONFIG_HW_CONSOLE=y
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_AMBA_PL010 is not set
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIAL_EP93XX=y
-CONFIG_SERIAL_EP93XX_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
 
 #
 # IPMI
@@ -820,25 +559,12 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-CONFIG_EP93XX_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set