merge of '471af30b8adb13fb7681f57fbf429fee02749677'

     and 'c75dc8320db6dd7f35c858791b148fbb1200f82c'

14 files changed, 53 insertions, 3652 deletions

diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
index 3d9c77539f..06eb56d2b6 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.conf
@@ -5,3 +5,5 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules  \
  pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
+
+USE_DEVFS = "1"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 13943bae39..2478ce17c9 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -20,7 +20,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
-USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
diff --git a/packages/lighttpd/1.4.13/configure.in.patch b/packages/lighttpd/1.4.13/configure.in.patch
deleted file mode 100644
index f4db64d4fe..0000000000
--- a/packages/lighttpd/1.4.13/configure.in.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in
-===================================================================
---- lighttpd-1.4.13-r0.orig/lighttpd-1.4.13/configure.in	2006-10-09 18:19:34.000000000 +0200
-+++ lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in	2006-12-07 22:31:52.000000000 +0100
-@@ -250,23 +250,9 @@
-     [WITH_PCRE=$withval],[WITH_PCRE=yes])
- AC_MSG_RESULT([$WITH_PCRE])
- 
--if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
--  AC_PATH_PROG(PCRECONFIG, pcre-config)
- 
--  if test x"$PCRECONFIG" != x; then
--    PCRE_LIB=`$PCRECONFIG --libs`
--    CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
--    OLDLIBS="$LIBS"
--    LIBS="$LIBS $PCRE_LIB"
--    AC_CHECK_LIB(pcre, pcre_compile, [
--      AC_CHECK_HEADERS([pcre.h], [
-         AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
-         AC_DEFINE([HAVE_PCRE_H], [1])
--      ])
--    ])
--    LIBS="$OLDLIBS"
--  fi
--fi
- 
- AC_SUBST(PCRE_LIB)
- 
diff --git a/packages/lighttpd/conf/.mtn2git_empty b/packages/lighttpd/conf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/conf/etc/.mtn2git_empty b/packages/lighttpd/conf/etc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/etc/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/conf/etc/init.d/.mtn2git_empty b/packages/lighttpd/conf/etc/init.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/etc/init.d/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/1.4.13/.mtn2git_empty b/packages/lighttpd/lighttpd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/lighttpd/1.4.13/.mtn2git_empty
+++ b/packages/lighttpd/lighttpd/.mtn2git_empty
diff --git a/packages/lighttpd/lighttpd/configure.in.patch b/packages/lighttpd/lighttpd/configure.in.patch
new file mode 100644
index 0000000000..3387fe5635
--- /dev/null
+++ b/packages/lighttpd/lighttpd/configure.in.patch
@@ -0,0 +1,34 @@
+Index: lighttpd-1.4.13/configure.in
+===================================================================
+--- lighttpd-1.4.13.orig/configure.in	2006-10-09 18:19:34.000000000 +0200
++++ lighttpd-1.4.13/configure.in	2007-02-13 18:42:34.000000000 +0100
+@@ -250,23 +250,23 @@
+     [WITH_PCRE=$withval],[WITH_PCRE=yes])
+ AC_MSG_RESULT([$WITH_PCRE])
+ 
+-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
++#if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
+   AC_PATH_PROG(PCRECONFIG, pcre-config)
+ 
+-  if test x"$PCRECONFIG" != x; then
++#  if test x"$PCRECONFIG" != x; then
+     PCRE_LIB=`$PCRECONFIG --libs`
+     CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
+     OLDLIBS="$LIBS"
+     LIBS="$LIBS $PCRE_LIB"
+-    AC_CHECK_LIB(pcre, pcre_compile, [
++#    AC_CHECK_LIB(pcre, pcre_compile, [
+       AC_CHECK_HEADERS([pcre.h], [
+         AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
+         AC_DEFINE([HAVE_PCRE_H], [1])
+       ])
+-    ])
++#    ])
+     LIBS="$OLDLIBS"
+-  fi
+-fi
++#  fi
++#fi
+ 
+ AC_SUBST(PCRE_LIB)
+ 
diff --git a/packages/lighttpd/lighttpd/index.html b/packages/lighttpd/lighttpd/index.html
new file mode 100644
index 0000000000..cd25bf17b3
--- /dev/null
+++ b/packages/lighttpd/lighttpd/index.html
@@ -0,0 +1 @@
+<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
diff --git a/packages/lighttpd/conf/etc/init.d/lighttpd b/packages/lighttpd/lighttpd/lighttpd
index 4661210c27..572381499a 100644
--- a/packages/lighttpd/conf/etc/init.d/lighttpd
+++ b/packages/lighttpd/lighttpd/lighttpd
@@ -22,12 +22,7 @@ case "$1" in
 	echo -n "Restarting $DESC: "
 	start-stop-daemon -K -x "$DAEMON"
 	sleep 1
-	KEY_ARGS=""
-	test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
-	test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
-	start-stop-daemon -S \
-	  -x "$DAEMON" -- $KEY_ARGS \
-	    -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+	start-stop-daemon -S -x "$DAEMON"
 	echo "$NAME."
 	;;
   *)
diff --git a/packages/lighttpd/conf/etc/lighttpd.conf b/packages/lighttpd/lighttpd/lighttpd.conf
index 5642e3175f..5642e3175f 100644
--- a/packages/lighttpd/conf/etc/lighttpd.conf
+++ b/packages/lighttpd/lighttpd/lighttpd.conf
diff --git a/packages/lighttpd/1.4.13/src-server.c.patch b/packages/lighttpd/lighttpd/src-server.c.patch
index 6ca0c9ea40..6ca0c9ea40 100644
--- a/packages/lighttpd/1.4.13/src-server.c.patch
+++ b/packages/lighttpd/lighttpd/src-server.c.patch
diff --git a/packages/lighttpd/lighttpd_1.4.13.bb b/packages/lighttpd/lighttpd_1.4.13.bb
index 9cb3d26425..504a129db8 100644
--- a/packages/lighttpd/lighttpd_1.4.13.bb
+++ b/packages/lighttpd/lighttpd_1.4.13.bb
@@ -2,12 +2,14 @@ DESCRIPTION = "Web server"
 SECTION = "net"
 DEPENDS = "sqlite3 libpcre libxml2"
 LICENSE = "BSD"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz \
-	   file://${PV}/configure.in.patch;patch=1;pnum=2 \
-	   file://${PV}/src-server.c.patch;patch=1;pnum=1 \
-	   file://conf/etc "
+	   file://configure.in.patch;patch=1 \
+	   file://src-server.c.patch;patch=1 \
+	   file://index.html \
+	   file://lighttpd.conf \
+	   file://lighttpd"
 
 EXTRA_OECONF="--without-bzip2 \
 		--without-ldap \
@@ -20,18 +22,20 @@ EXTRA_OECONF="--without-bzip2 \
 		--disable-nls \
 		--disable-static"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
 
-do_install_append() {
-	cp -R ${WORKDIR}/conf/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/init.d/.svn
+INITSCRIPT_NAME = "lighttpd"
+INITSCRIPT_PARAMS = "defaults 70"
 
-	chmod -R 755 ${D}/etc
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
+	install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
 }
 
 do_stage() {
 	autotools_stage_all
 }
 
-FILES_${PN} += "${libdir}/mod_*.so /etc"
+FILES_${PN} += "${libdir}/mod_*.so ${sysconfdir} /www"
diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.mq200.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.mq200.patch
index 3c91b2cbf8..6b315de79d 100644
--- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.mq200.patch
+++ b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.mq200.patch
@@ -1,1943 +1,3 @@
-diff -uNr linux-2.6.20.vanilla/arch/arm/configs/simpad_defconfig linux-2.6.20/arch/arm/configs/simpad_defconfig
---- linux-2.6.20.vanilla/arch/arm/configs/simpad_defconfig	2007-02-10 19:01:14.000000000 +0100
-+++ linux-2.6.20/arch/arm/configs/simpad_defconfig	2007-02-11 16:39:39.000000000 +0100
-@@ -1,75 +1,121 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.12-rc1-bk2
--# Mon Mar 28 00:10:36 2005
-+# Linux kernel version: 2.6.19.1
-+# Tue Jan  2 22:07:26 2007
- #
- CONFIG_ARM=y
-+# CONFIG_GENERIC_TIME is not set
- CONFIG_MMU=y
--CONFIG_UID16=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
- CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_IOMAP=y
-+CONFIG_ARCH_MTD_XIP=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
- 
- #
- # Code maturity level options
- #
- CONFIG_EXPERIMENTAL=y
--CONFIG_CLEAN_COMPILE=y
- CONFIG_BROKEN_ON_SMP=y
- CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
- 
- #
- # General setup
- #
- CONFIG_LOCALVERSION="oe1"
-+CONFIG_LOCALVERSION_AUTO=y
- CONFIG_SWAP=y
- CONFIG_SYSVIPC=y
-+# CONFIG_IPC_NS is not set
- # CONFIG_POSIX_MQUEUE is not set
- # CONFIG_BSD_PROCESS_ACCT is not set
--CONFIG_SYSCTL=y
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_UTS_NS is not set
- # CONFIG_AUDIT is not set
--CONFIG_HOTPLUG=y
--CONFIG_KOBJECT_UEVENT=y
- # CONFIG_IKCONFIG is not set
-+# CONFIG_RELAY is not set
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
- CONFIG_EMBEDDED=y
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
- CONFIG_KALLSYMS=y
- CONFIG_KALLSYMS_ALL=y
- CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
- CONFIG_BASE_FULL=y
- CONFIG_FUTEX=y
- CONFIG_EPOLL=y
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- CONFIG_SHMEM=y
--CONFIG_CC_ALIGN_FUNCTIONS=0
--CONFIG_CC_ALIGN_LABELS=0
--CONFIG_CC_ALIGN_LOOPS=0
--CONFIG_CC_ALIGN_JUMPS=0
-+CONFIG_SLAB=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_RT_MUTEXES=y
- # CONFIG_TINY_SHMEM is not set
- CONFIG_BASE_SMALL=0
-+# CONFIG_SLOB is not set
- 
- #
- # Loadable module support
- #
- CONFIG_MODULES=y
- # CONFIG_MODULE_UNLOAD is not set
--CONFIG_OBSOLETE_MODPARM=y
- # CONFIG_MODVERSIONS is not set
- # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_KMOD=y
- 
- #
-+# Block layer
-+#
-+CONFIG_BLOCK=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+
-+#
- # System Type
- #
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
- # CONFIG_ARCH_CLPS7500 is not set
- # CONFIG_ARCH_CLPS711X is not set
- # CONFIG_ARCH_CO285 is not set
- # CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
- # CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_IOP3XX is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
- # CONFIG_ARCH_IXP4XX is not set
- # CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP23XX is not set
- # CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_PNX4008 is not set
- # CONFIG_ARCH_PXA is not set
- # CONFIG_ARCH_RPC is not set
- CONFIG_ARCH_SA1100=y
-@@ -77,9 +123,6 @@
- # CONFIG_ARCH_SHARK is not set
- # CONFIG_ARCH_LH7A40X is not set
- # CONFIG_ARCH_OMAP is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_H720X is not set
- 
- #
- # SA11x0 Implementations
-@@ -109,11 +152,14 @@
- CONFIG_CPU_CACHE_V4WB=y
- CONFIG_CPU_CACHE_VIVT=y
- CONFIG_CPU_TLB_V4WB=y
--CONFIG_CPU_MINICACHE=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
- 
- #
- # Processor Features
- #
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
- 
- #
- # Bus support
-@@ -126,6 +172,8 @@
- CONFIG_PCCARD=y
- # CONFIG_PCMCIA_DEBUG is not set
- CONFIG_PCMCIA=y
-+CONFIG_PCMCIA_LOAD_CIS=y
-+CONFIG_PCMCIA_IOCTL=y
- 
- #
- # PC-card bridges
-@@ -138,7 +186,21 @@
- # Kernel Features
- #
- CONFIG_PREEMPT=y
-+# CONFIG_NO_IDLE_HZ is not set
-+CONFIG_HZ=100
-+# CONFIG_AEABI is not set
-+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-+CONFIG_NODES_SHIFT=2
-+CONFIG_SELECT_MEMORY_MODEL=y
-+# CONFIG_FLATMEM_MANUAL is not set
-+CONFIG_DISCONTIGMEM_MANUAL=y
-+# CONFIG_SPARSEMEM_MANUAL is not set
- CONFIG_DISCONTIGMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_NEED_MULTIPLE_NODES=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
- CONFIG_LEDS=y
- CONFIG_LEDS_TIMER=y
- # CONFIG_LEDS_CPU is not set
-@@ -181,9 +243,161 @@
- #
- CONFIG_PM=y
- # CONFIG_PM_LEGACY is not set
-+# CONFIG_PM_DEBUG is not set
-+# CONFIG_PM_SYSFS_DEPRECATED is not set
- CONFIG_APM=y
- 
- #
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+# CONFIG_NETDEBUG is not set
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=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=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+
-+#
-+# DCCP Configuration (EXPERIMENTAL)
-+#
-+# CONFIG_IP_DCCP is not set
-+
-+#
-+# SCTP Configuration (EXPERIMENTAL)
-+#
-+# CONFIG_IP_SCTP is not set
-+
-+#
-+# TIPC Configuration (EXPERIMENTAL)
-+#
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+CONFIG_IRDA=m
-+
-+#
-+# IrDA protocols
-+#
-+CONFIG_IRLAN=m
-+CONFIG_IRNET=m
-+CONFIG_IRCOMM=m
-+# 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=m
-+
-+#
-+# Dongle support
-+#
-+# CONFIG_DONGLE is not set
-+
-+#
-+# Old SIR device drivers
-+#
-+CONFIG_IRPORT_SIR=m
-+
-+#
-+# Old Serial dongle support
-+#
-+# CONFIG_DONGLE_OLD is not set
-+
-+#
-+# FIR device drivers
-+#
-+CONFIG_SA1100_FIR=m
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+# CONFIG_BT_HIDP is not set
-+
-+#
-+# Bluetooth device drivers
-+#
-+# CONFIG_BT_HCIUART 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_IEEE80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+
-+#
- # Device Drivers
- #
- 
-@@ -192,8 +406,14 @@
- #
- CONFIG_STANDALONE=y
- CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
-+CONFIG_FW_LOADER=y
- # CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+
-+#
-+# Connector - unified userspace <-> kernelspace linker
-+#
-+# CONFIG_CONNECTOR is not set
- 
- #
- # Memory Technology Devices (MTD)
-@@ -214,6 +434,8 @@
- # CONFIG_FTL is not set
- # CONFIG_NFTL is not set
- # CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
- 
- #
- # RAM/ROM/Flash chip drivers
-@@ -236,6 +458,7 @@
- # CONFIG_MTD_CFI_I2 is not set
- # 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 is not set
- # CONFIG_MTD_CFI_STAA is not set
-@@ -243,6 +466,7 @@
- CONFIG_MTD_RAM=y
- # CONFIG_MTD_ROM is not set
- # CONFIG_MTD_ABSENT is not set
-+# CONFIG_MTD_OBSOLETE_CHIPS is not set
- # CONFIG_MTD_XIP is not set
- 
- #
-@@ -252,8 +476,8 @@
- # CONFIG_MTD_PHYSMAP is not set
- # CONFIG_MTD_ARM_INTEGRATOR is not set
- CONFIG_MTD_SA1100=y
--# CONFIG_MTD_EDB7312 is not set
- # CONFIG_MTD_IMPA7 is not set
-+# CONFIG_MTD_PLATRAM is not set
- 
- #
- # Self-contained MTD device drivers
-@@ -261,7 +485,6 @@
- # 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
- 
- #
-@@ -277,6 +500,11 @@
- # CONFIG_MTD_NAND is not set
- 
- #
-+# OneNAND Flash Device Drivers
-+#
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
- # Parallel port support
- #
- # CONFIG_PARPORT is not set
-@@ -289,8 +517,6 @@
- #
- # Block devices
- #
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_XD is not set
- # CONFIG_BLK_DEV_COW_COMMON is not set
- CONFIG_BLK_DEV_LOOP=m
- # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-@@ -298,16 +524,9 @@
- CONFIG_BLK_DEV_RAM=m
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=8192
--CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_BLK_DEV_INITRD is not set
- # CONFIG_CDROM_PKTCDVD is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
- # CONFIG_ATA_OVER_ETH is not set
- 
- #
-@@ -318,7 +537,14 @@
- #
- # SCSI device support
- #
-+# CONFIG_RAID_ATTRS is not set
- # CONFIG_SCSI is not set
-+# CONFIG_SCSI_NETLINK is not set
-+
-+#
-+# Serial ATA (prod) and Parallel ATA (experimental) drivers
-+#
-+# CONFIG_ATA is not set
- 
- #
- # Multi-device support (RAID and LVM)
-@@ -328,6 +554,7 @@
- #
- # Fusion MPT device support
- #
-+# CONFIG_FUSION is not set
- 
- #
- # IEEE 1394 (FireWire) support
-@@ -338,136 +565,8 @@
- #
- 
- #
--# Networking support
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--CONFIG_PACKET_MMAP=y
--# CONFIG_NETLINK_DEV is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--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_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_IP_TCPDIAG is not set
--# CONFIG_IP_TCPDIAG_IPV6 is not set
--# CONFIG_IPV6 is not set
--# CONFIG_NETFILTER is not set
--
--#
--# SCTP Configuration (EXPERIMENTAL)
--#
--# CONFIG_IP_SCTP is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_NET_DIVERT is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--
--#
--# QoS and/or fair queueing
--#
--# CONFIG_NET_SCHED is not set
--# CONFIG_NET_CLS_ROUTE is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_HAMRADIO is not set
--CONFIG_IRDA=m
--
--#
--# IrDA protocols
--#
--CONFIG_IRLAN=m
--CONFIG_IRNET=m
--CONFIG_IRCOMM=m
--# 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
--#
--
-+# Network device support
- #
--# SIR device drivers
--#
--CONFIG_IRTTY_SIR=m
--
--#
--# Dongle support
--#
--# CONFIG_DONGLE is not set
--
--#
--# Old SIR device drivers
--#
--CONFIG_IRPORT_SIR=m
--
--#
--# Old Serial dongle support
--#
--# CONFIG_DONGLE_OLD is not set
--
--#
--# FIR device drivers
--#
--# 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_SA1100_FIR=m
--CONFIG_BT=m
--CONFIG_BT_L2CAP=m
--CONFIG_BT_SCO=m
--CONFIG_BT_RFCOMM=m
--CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=m
--CONFIG_BT_BNEP_MC_FILTER=y
--CONFIG_BT_BNEP_PROTO_FILTER=y
--# CONFIG_BT_HIDP is not set
--
--#
--# Bluetooth device drivers
--#
--# CONFIG_BT_HCIUART 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_NETDEVICES=y
- CONFIG_DUMMY=y
- # CONFIG_BONDING is not set
-@@ -480,14 +579,19 @@
- # CONFIG_ARCNET is not set
- 
- #
-+# PHY device support
-+#
-+# CONFIG_PHYLIB is not set
-+
-+#
- # Ethernet (10 or 100Mbit)
- #
- CONFIG_NET_ETHERNET=y
- CONFIG_MII=m
- # CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_LANCE is not set
- # CONFIG_NET_VENDOR_SMC is not set
- # CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
- # CONFIG_NET_VENDOR_RACAL is not set
- # CONFIG_AT1700 is not set
- # CONFIG_DEPCA is not set
-@@ -497,7 +601,6 @@
- # CONFIG_AC3200 is not set
- # CONFIG_APRICOT is not set
- # CONFIG_CS89x0 is not set
--# CONFIG_NET_POCKET is not set
- 
- #
- # Ethernet (1000 Mbit)
-@@ -516,6 +619,7 @@
- # Wireless LAN (non-hamradio)
- #
- CONFIG_NET_RADIO=y
-+# CONFIG_NET_WIRELESS_RTNETLINK is not set
- 
- #
- # Obsolete Wireless cards support (pre-802.11)
-@@ -542,6 +646,7 @@
- #
- # CONFIG_AIRO_CS is not set
- # CONFIG_PCMCIA_WL3501 is not set
-+# CONFIG_HOSTAP is not set
- CONFIG_NET_WIRELESS=y
- 
- #
-@@ -568,10 +673,14 @@
- CONFIG_PPP_SYNC_TTY=m
- CONFIG_PPP_DEFLATE=m
- CONFIG_PPP_BSDCOMP=m
-+# CONFIG_PPP_MPPE is not set
- CONFIG_PPPOE=m
- # CONFIG_SLIP is not set
-+CONFIG_SLHC=m
- # CONFIG_SHAPER is not set
- # CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
- 
- #
- # ISDN subsystem
-@@ -582,6 +691,7 @@
- # Input device support
- #
- CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
- 
- #
- # Userland interfaces
-@@ -614,7 +724,6 @@
- # CONFIG_SERIO_LIBPS2 is not set
- # CONFIG_SERIO_RAW is not set
- # CONFIG_GAMEPORT is not set
--CONFIG_SOUND_GAMEPORT=y
- 
- #
- # Character devices
-@@ -622,6 +731,7 @@
- CONFIG_VT=y
- CONFIG_VT_CONSOLE=y
- CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- 
- #
-@@ -649,20 +759,21 @@
- # Watchdog Cards
- #
- # CONFIG_WATCHDOG is not set
-+CONFIG_HW_RANDOM=y
- # CONFIG_NVRAM is not set
--# CONFIG_RTC is not set
- # CONFIG_DTLK is not set
- # CONFIG_R3964 is not set
- 
- #
- # Ftape, the floppy tape device driver
- #
--# CONFIG_DRM is not set
- 
- #
- # PCMCIA character devices
- #
- # CONFIG_SYNCLINK_CS is not set
-+# CONFIG_CARDMAN_4000 is not set
-+# CONFIG_CARDMAN_4040 is not set
- # CONFIG_RAW_DRIVER is not set
- 
- #
-@@ -676,8 +787,48 @@
- # CONFIG_I2C is not set
- 
- #
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+
-+#
-+# Dallas's 1-wire bus
-+#
-+# CONFIG_W1 is not set
-+
-+#
-+# Hardware Monitoring support
-+#
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_ABITUGURU is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+
-+#
- # Misc devices
- #
-+# CONFIG_TIFM_CORE is not set
-+
-+#
-+# Multimedia Capabilities Port drivers
-+#
-+# CONFIG_MCP_SA11X0 is not set
-+
-+#
-+# LED devices
-+#
-+# CONFIG_NEW_LEDS is not set
-+
-+#
-+# LED drivers
-+#
-+
-+#
-+# LED Triggers
-+#
- 
- #
- # Multimedia devices
-@@ -692,14 +843,18 @@
- #
- # Graphics support
- #
-+CONFIG_FIRMWARE_EDID=y
- CONFIG_FB=y
--# CONFIG_FB_CFB_FILLRECT is not set
--# CONFIG_FB_CFB_COPYAREA is not set
--# CONFIG_FB_CFB_IMAGEBLIT is not set
--# CONFIG_FB_SOFT_CURSOR is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
- # CONFIG_FB_MODE_HELPERS is not set
- # CONFIG_FB_TILEBLITTING is not set
- # CONFIG_FB_SA1100 is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_MQ200=y
- # CONFIG_FB_VIRTUAL is not set
- 
- #
-@@ -709,6 +864,7 @@
- # CONFIG_MDA_CONSOLE is not set
- CONFIG_DUMMY_CONSOLE=y
- CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
- # CONFIG_FONTS is not set
- CONFIG_FONT_8x8=y
- CONFIG_FONT_8x16=y
-@@ -742,9 +898,14 @@
- #
- CONFIG_USB_ARCH_HAS_HCD=y
- # CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
- # CONFIG_USB is not set
- 
- #
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
- # USB Gadget Support
- #
- # CONFIG_USB_GADGET is not set
-@@ -755,14 +916,22 @@
- # CONFIG_MMC is not set
- 
- #
-+# Real Time Clock
-+#
-+CONFIG_RTC_LIB=y
-+# CONFIG_RTC_CLASS is not set
-+
-+#
- # File systems
- #
- CONFIG_EXT2_FS=m
- # CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=m
- CONFIG_EXT3_FS_XATTR=y
- # CONFIG_EXT3_FS_POSIX_ACL is not set
- # CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
- CONFIG_JBD=m
- # CONFIG_JBD_DEBUG is not set
- CONFIG_FS_MBCACHE=m
-@@ -771,17 +940,19 @@
- CONFIG_REISERFS_PROC_INFO=y
- # CONFIG_REISERFS_FS_XATTR is not set
- # CONFIG_JFS_FS is not set
--
--#
--# XFS support
--#
-+# CONFIG_FS_POSIX_ACL is not set
- # CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
- # CONFIG_MINIX_FS is not set
- # CONFIG_ROMFS_FS is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
- # CONFIG_QUOTA is not set
- CONFIG_DNOTIFY=y
- # CONFIG_AUTOFS_FS is not set
- # CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
- 
- #
- # CD-ROM/DVD Filesystems
-@@ -803,14 +974,12 @@
- # Pseudo filesystems
- #
- CONFIG_PROC_FS=y
-+CONFIG_PROC_SYS