merge of '2c0fad768939f606b65e1c9b4e1220f0209883f7'

     and 'c441a97d0a545c68ad7de39b4729d857ef08723c'

18 files changed, 1917 insertions, 1178 deletions

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index d172fb1766..9a8db4f8f2 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -1,3 +1,7 @@
+#
+# Copyright 2006-2007 OpenedHand Ltd.
+#
+
 inherit package
 
 PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
@@ -132,6 +136,7 @@ python do_package_deb () {
             continue
         controldir = os.path.join(root, 'DEBIAN')
         bb.mkdirhier(controldir)
+        os.chmod(controldir, 0755)
         try:
             ctrlfile = file(os.path.join(controldir, 'control'), 'wb')
             # import codecs
@@ -150,7 +155,7 @@ python do_package_deb () {
         fields.append(["Priority: %s\n", ['PRIORITY']])
         fields.append(["Maintainer: %s\n", ['MAINTAINER']])
         fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
-        fields.append(["OE: %s\n", ['P']])
+        fields.append(["OE: %s\n", ['PN']])
         fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
 #        Package, Version, Maintainer, Description - mandatory
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index f444541509..67fa661308 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -1,3 +1,6 @@
+#
+# Copyright 2006-2007 Openedhand Ltd.
+#
 
 do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
 
@@ -52,21 +55,21 @@ fakeroot rootfs_deb_do_rootfs () {
 	}
 
 	if [ ! -z "${LINGUAS_INSTALL}" ]; then
-		apt-get install glibc-localedata-i18n
-		if [ $? -eq 1 ]; then
-			exit 1
+		apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
+		if [ $? -ne 0 ]; then
+			exit $?
 		fi
 		for i in ${LINGUAS_INSTALL}; do
-			apt-get install $i
-			if [ $? -eq 1 ]; then
-				exit 1
+			apt-get install $i --force-yes --allow-unauthenticated
+			if [ $? -ne 0 ]; then
+				exit $?
 			fi
 		done
 	fi
 
 	if [ ! -z "${PACKAGE_INSTALL}" ]; then
 		for i in ${PACKAGE_INSTALL}; do
-			apt-get install $i
+			apt-get install $i --force-yes --allow-unauthenticated
 			if [ $? -eq 1 ]; then
 				exit 1
 			fi
@@ -134,3 +137,7 @@ rootfs_deb_log_check() {
 	true
 }
 
+remove_packaging_data_files() {
+	rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/
+	rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
+}
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
new file mode 100644
index 0000000000..adb8f23fa3
--- /dev/null
+++ b/conf/machine/alix.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Alix
+#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#
+# http://pcengines.ch/alix1c.htm
+
+# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+TARGET_ARCH = "i686"
+
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+
+IMAGE_FSTYPES += "tar.gz"
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-modules \
+	"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index fe0df53cc5..ad94420196 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -11,9 +11,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
 
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
 require conf/machine/include/tune-arm926ejs.conf
diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glibc/eglibc-svn/.mtn2git_empty
diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch
new file mode 100644
index 0000000000..0bf6c57852
--- /dev/null
+++ b/packages/glibc/eglibc-svn/export-fcntl2.patch
@@ -0,0 +1,11 @@
+--- libc/io/Makefile.orig	2007-08-07 17:41:33.000000000 -0700
++++ libc/io/Makefile	2007-08-07 17:42:25.000000000 -0700
+@@ -23,7 +23,7 @@ subdir	:= io
+ 
+ headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
+ 	   sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
+-	   poll.h sys/poll.h bits/poll.h \
++	   poll.h sys/poll.h bits/poll.h bits/fcntl2.h \
+ 	   utime.h ftw.h fts.h sys/sendfile.h
+ 
+ routines :=								\
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index bf5023ca85..81d5916a21 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -1,10 +1,12 @@
 require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
-
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.6+svn${SRCDATE}"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
-          "
+           file://export-fcntl2.patch;patch=1 \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk"
 S = "${WORKDIR}/trunk/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
@@ -83,5 +85,51 @@ do_compile () {
         ) 
 }       
 
+do_stage() {
+        rm -f ${STAGING_LIBDIR}/libc.so.6
+        oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+                   '${STAGING_LIBDIR}/libc.so.6' \
+                   install-headers install-lib
+
+        install -d ${STAGING_INCDIR}/gnu \
+                   ${STAGING_INCDIR}/bits \
+                   ${STAGING_INCDIR}/rpcsvc
+        install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+        install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+        install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+        done
+        for i in libc.a libc_pic.a libc_nonshared.a; do
+                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+        done
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+        rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+        oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+                   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+                   install-headers install-lib
+
+        install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+                   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+                   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+        install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+        install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+        install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+        done
+
+        for i in libc.a libc_pic.a libc_nonshared.a; do
+                install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+        done
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
 
 require glibc-package.bbclass
diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc
index 7cc6c58b6b..8554d2413c 100644
--- a/packages/linux/linux-gta01.inc
+++ b/packages/linux/linux-gta01.inc
@@ -93,6 +93,7 @@ do_deploy() {
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
 	${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
 	rm -f linux.bin.gz
 }
 
diff --git a/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch b/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch
deleted file mode 100644
index 7ecc48f956..0000000000
--- a/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch
+++ /dev/null
@@ -1,947 +0,0 @@
-Index: linux-2.6.21/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.21.orig/drivers/spi/Kconfig	2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/drivers/spi/Kconfig	2007-07-03 21:40:52.000000000 +0200
-@@ -89,6 +89,10 @@
- 	  This enables using the Freescale iMX SPI controller in master
- 	  mode.
- 
-+config SPI_LOCOMO
-+	tristate "Locomo SPI master"
-+	depends on SPI_MASTER && SHARP_LOCOMO && EXPERIMENTAL
-+
- config SPI_MPC83xx
- 	tristate "Freescale MPC83xx SPI controller"
- 	depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
-Index: linux-2.6.21/drivers/spi/locomo_spi.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/drivers/spi/locomo_spi.c	2007-07-03 21:40:52.000000000 +0200
-@@ -0,0 +1,873 @@
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/stat.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <asm/hardware/locomo.h>
-+#include <linux/mmc/host.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/mmc_spi.h>
-+#include <linux/workqueue.h>
-+#include <linux/spinlock.h>
-+#include <linux/list.h>
-+#include "locomo_spi.h"
-+static struct locomospi_dev * spidev;
-+static struct work_struct transfer_wq;
-+int verbose=0;
-+/* MMC_SPI functions *********************************************************/
-+
-+static int locomommcspi_init(struct device *dev, irqreturn_t (*isr)(int, void*), void *mmc)
-+{
-+	int result;
-+	locomo_gpio_set_irq(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_DETECT, LOCOMO_GPIO_IRQ_ON_RISE | LOCOMO_GPIO_IRQ_ON_FALL);
-+	spidev->mmc_spi_isr = isr;
-+	result=request_irq(IRQ_LOCOMO_CARDDETECT, locomospi_cardisr, SA_SHIRQ, "locomo-spi",  mmc);
-+	return result;
-+}
-+
-+static void locomommcspi_exit(struct device *dev, void* mmc)
-+{
-+	free_irq(IRQ_LOCOMO_CARDDETECT, mmc);
-+}
-+
-+static int locomommcspi_getro(struct device *dev)
-+{
-+	return locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROTECT) > 0 ? 1 : 0;
-+}
-+
-+static void locomommcspi_powermode(struct device *dev, unsigned char mode)
-+{
-+	if(mode == MMC_POWER_OFF && spidev->card_power != 0)
-+		locomospi_power(0);
-+	else if( spidev->card_power != 1)
-+		locomospi_power(1);
-+
-+}
-+
-+static void locomommcspi_reset(void)
-+{
-+	/* transmit card reset sequence, should be done from mmc_layer */
-+	locomospi_setcs(1);
-+	tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10);
-+	locomospi_setcs(0);
-+}
-+
-+
-+static struct mmc_spi_platform_data colliemmc ={
-+	.init 		= locomommcspi_init,
-+	.exit 		= locomommcspi_exit,
-+	.detect_delay 	= HZ,
-+	.get_ro 	= locomommcspi_getro,
-+	.ocr_mask 	= MMC_VDD_32_33 | MMC_VDD_33_34,
-+	.setpowermode	= locomommcspi_powermode,
-+	.reset		= locomommcspi_reset,
-+};
-+
-+/* Utility function **********************************************************/
-+
-+static irqreturn_t locomospi_cardisr(int irq, void *dev_id)
-+{
-+	u16 r;
-+	if(locomospi_carddetect()){
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r |= 0x80;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r |= 0x40;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+		/* transmit card reset sequence, should be done from mmc_layer */
-+//		locomospi_setcs(1);
-+  //              tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10);
-+//                locomospi_setcs(0);
-+	} else {
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r &= ~0x80;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r &= ~0x40;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+	}
-+	return spidev->mmc_spi_isr(irq, dev_id);
-+}
-+
-+static void locomospi_power(int on)
-+{
-+	locomo_gpio_write(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_POWER, on);
-+	spidev->card_power=on;
-+	set_current_state(TASK_INTERRUPTIBLE);
-+	if(on){
-+		schedule_timeout(HZ/10);
-+	} else {
-+		schedule_timeout(2*HZ);
-+	}
-+
-+}
-+
-+static void locomospi_setclock(unsigned int base, unsigned int mult)
-+{
-+	u16 r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+	base &= 0x7;
-+	mult &= 0x3;
-+	r &= ~(0x7  | 0x18       | 0x40);
-+	locomo_writel(r,spidev->base+LOCOMO_SPIMD);
-+	r |=  (base | (mult <<3) | 0x40);
-+	locomo_writel(r,spidev->base+LOCOMO_SPIMD);
-+	spidev->clock_base = base;
-+	spidev->clock_mult = mult;
-+
-+}
-+// returns 1 if card ist present, 0 otherwise
-+static int locomospi_carddetect()
-+{
-+	return (locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1;
-+}
-+
-+static void locomospi_togglecs()
-+{
-+	u16 r;
-+	r = locomo_readl(spidev->base + LOCOMO_SPICT);
-+	r ^= 0x40; // I think this is CHIPSELECTHIGH
-+	locomo_writel(r, spidev->base + LOCOMO_SPICT);
-+}
-+
-+static void locomospi_setcs(int high)
-+{
-+	u16 r;
-+	r = locomo_readl(spidev->base + LOCOMO_SPICT);
-+	if(high)
-+		r |= 0x40;
-+	else
-+		r &= ~0x40;
-+	locomo_writel(r, spidev->base + LOCOMO_SPICT);
-+}
-+
-+static void locomospi_reg_open()
-+{
-+	u16 r;
-+	spidev->clock_base = 4;
-+	spidev->clock_mult = 0;
-+	locomospi_power(1);
-+	locomo_writel( 0x6c00 | (2 <<3)|4, spidev->base+LOCOMO_SPIMD);
-+	if(locomospi_carddetect()){
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r |= 0x80;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+		r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+		r |= 0x40;
-+		locomo_writel( r, spidev->base+LOCOMO_SPIMD);
-+	}
-+	locomo_writel( 0x40, spidev->base+LOCOMO_SPICT);
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	r |= 0x80;
-+	locomo_writel( r, spidev->base+LOCOMO_SPICT);
-+	udelay(200);
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	locomo_writel(r, spidev->base+LOCOMO_SPICT);
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	r |= 0x1;
-+	locomo_writel(r, spidev->base+LOCOMO_SPICT);
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	r &= ~0x40;
-+	locomo_writel(r, spidev->base+LOCOMO_SPICT);
-+}
-+
-+static void locomospi_reg_release()
-+{
-+	u16 r;
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	r &= ~0x80;
-+	locomo_writel(r, spidev->base+LOCOMO_SPICT);
-+	r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+	r &= ~0x40;
-+	locomo_writel(r, spidev->base+LOCOMO_SPIMD);
-+	r = locomo_readl(spidev->base+LOCOMO_SPIMD);
-+	r &= ~0x80;
-+	locomo_writel(r, spidev->base+LOCOMO_SPIMD);
-+	r = locomo_readl(spidev->base+LOCOMO_SPICT);
-+	r |= 0x40;
-+	locomo_writel(r, spidev->base+LOCOMO_SPICT);
-+	locomospi_power(0);
-+}
-+
-+static int tx(const char* buffer, int size)
-+{
-+	int i=0,j=0;
-+//	int result=0;
-+	int wait;
-+	if(!spidev->clock_base && !spidev->clock_mult)
-+		return 0;
-+	if(spidev->clock_base == 4)
-+		wait = 0x10000;
-+	else
-+		wait = 8;
-+
-+	for(i=0; i<size; i++){
-+/*		if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)){
-+			result = wait_event_interruptible(spidev->waitqueue, locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW);
-+			if(result) {
-+				dev_err(&spidev->sdev->dev, "received Signal. giving up tx.");
-+				return i;
-+			}
-+		}*/
-+		for(j=0; j <= wait; j++){
-+			if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)
-+				break;
-+		}
-+		locomo_writel((u16) buffer[i], spidev->base+LOCOMO_SPITD);
-+		if(verbose)
-+			printk(KERN_DEBUG "locomospi: sent:  char :%x\n", (u16) buffer[i]);
-+		if(spidev->clock_base){
-+			for(j=0; j <= wait; j++){
-+				if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW))
-+					break;
-+			}
-+		}
-+	}
-+	if(spidev->clock_base){
-+		for(i=0; i <= wait; i++){
-+			if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_TEND)
-+				break;
-+		}
-+	}
-+	return j;
-+}
-+
-+static int rx(char* buffer, int size)
-+{
-+	int i,j;
-+//	int result=0;
-+	int wait;
-+	u16 rd;
-+	if(!spidev->clock_base && !spidev->clock_mult)
-+		return 0;
-+	if(spidev->clock_base == 4)
-+		wait = 0x10000;
-+	else
-+		wait = 8;
-+
-+	for(i=0; i<size; i++){
-+/*		if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)){
-+			result = wait_event_interruptible(spidev->waitqueue, locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW);
-+			if(result) {
-+				dev_err(&spidev->sdev->dev, "received Signal. giving up tx.");
-+				return i;
-+			}
-+		}*/
-+		for(j=0; j <= wait; j++){
-+			if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)
-+				break;
-+		}
-+		rd= locomo_readl(spidev->base+LOCOMO_SPIRD);
-+		if(verbose)
-+			printk(KERN_DEBUG "locomospi: received:  char :%x\n", (u16) buffer[i]);
-+		buffer[i]=(char) rd;
-+		if(spidev->clock_base){
-+			for(j=0; j <= wait; j++){
-+				if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR))
-+					break;
-+			}
-+		}
-+	}
-+	return i;
-+}
-+
-+/*
-+static irqreturn_t locomospi_rwready(int irq, void *dev_id)
-+{
-+	struct locomospi_dev* dev=(struct locomospi_dev*) dev_id;
-+//	dev_dbg(&spidev->sdev->dev, "IRQ: %d\n", irq);
-+//	printk(KERN_DEBUG "locomospi: IRQ: %d\n", irq);
-+	wake_up_interruptible(&dev->waitqueue);
-+	return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t locomospi_testisr(int irq, void *dev_id)
-+{
-+	char *buf="";
-+	switch(irq){
-+		case IRQ_LOCOMO_SPI_RFR: buf="RFR";
-+					 break;
-+		case IRQ_LOCOMO_SPI_RFW: buf="RFW";
-+					 break;
-+		case IRQ_LOCOMO_SPI_OVRN:buf="OVRN";
-+					 break;
-+		case IRQ_LOCOMO_SPI_TEND:buf="TEND";
-+					 break;
-+		case IRQ_LOCOMO_CARDDETECT:
-+					 buf="CARD_DETECT";
-+					 break;
-+		default:		return IRQ_NONE;
-+	}
-+	printk(KERN_DEBUG "locomospi: IRQ: %s\n",buf);
-+//	dev_dbg(&spidev->sdev->dev, "IRQ: %s\n",buf);
-+	return IRQ_HANDLED;
-+}
-+*/
-+/* sysfs attributes used for debug *******************************************/
-+
-+/* SPI registers */
-+ssize_t locomospi_showspimd(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIMD));
-+}
-+
-+ssize_t locomospi_storespimd(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIMD);
-+	return count;
-+}
-+static DRIVER_ATTR(spimd, S_IWUSR | S_IRUGO, locomospi_showspimd, locomospi_storespimd);
-+
-+ssize_t locomospi_showspict(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPICT));
-+}
-+
-+ssize_t locomospi_storespict(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPICT);
-+	return count;
-+}
-+static DRIVER_ATTR(spict, S_IWUSR | S_IRUGO, locomospi_showspict, locomospi_storespict);
-+
-+ssize_t locomospi_showspist(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIST));
-+}
-+
-+ssize_t locomospi_storespist(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIST);
-+	return count;
-+}
-+static DRIVER_ATTR(spist, S_IWUSR | S_IRUGO, locomospi_showspist, locomospi_storespist);
-+
-+ssize_t locomospi_showspiis(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIS));
-+}
-+
-+ssize_t locomospi_storespiis(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIS);
-+	return count;
-+}
-+static DRIVER_ATTR(spiis, S_IWUSR | S_IRUGO, locomospi_showspiis, locomospi_storespiis);
-+
-+ssize_t locomospi_showspiwe(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIWE));
-+}
-+
-+ssize_t locomospi_storespiwe(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIWE);
-+	return count;
-+}
-+static DRIVER_ATTR(spiwe, S_IWUSR | S_IRUGO, locomospi_showspiwe, locomospi_storespiwe);
-+
-+ssize_t locomospi_showspiie(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIE));
-+}
-+
-+ssize_t locomospi_storespiie(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIE);
-+	return count;
-+}
-+static DRIVER_ATTR(spiie, S_IWUSR | S_IRUGO, locomospi_showspiie, locomospi_storespiie);
-+
-+ssize_t locomospi_showspiir(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIR));
-+}
-+
-+ssize_t locomospi_storespiir(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIR);
-+	return count;
-+}
-+static DRIVER_ATTR(spiir, S_IWUSR | S_IRUGO, locomospi_showspiir, locomospi_storespiir);
-+
-+ssize_t locomospi_showspitd(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPITD));
-+}
-+
-+ssize_t locomospi_storespitd(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITD);
-+	return count;
-+}
-+static DRIVER_ATTR(spitd, S_IWUSR | S_IRUGO, locomospi_showspitd, locomospi_storespitd);
-+
-+ssize_t locomospi_showspird(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIRD));
-+}
-+
-+ssize_t locomospi_storespird(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRD);
-+	return count;
-+}
-+static DRIVER_ATTR(spird, S_IWUSR | S_IRUGO, locomospi_showspird, locomospi_storespird);
-+
-+ssize_t locomospi_showspits(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPITS));
-+}
-+
-+ssize_t locomospi_storespits(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITS);
-+	return count;
-+}
-+static DRIVER_ATTR(spits, S_IWUSR | S_IRUGO, locomospi_showspits, locomospi_storespits);
-+
-+ssize_t locomospi_showspirs(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIRS));
-+}
-+
-+ssize_t locomospi_storespirs(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRS);
-+	return count;
-+}
-+static DRIVER_ATTR(spirs, S_IWUSR | S_IRUGO, locomospi_showspirs, locomospi_storespirs);
-+
-+/* MMC Card status */
-+
-+ssize_t locomospi_showpower(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n", spidev->card_power);
-+}
-+
-+ssize_t locomospi_storepower(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomospi_power(simple_strtoul(buf, NULL, 10));
-+	return count;
-+}
-+static DRIVER_ATTR(cardpower, S_IWUSR | S_IRUGO, locomospi_showpower, locomospi_storepower);
-+
-+ssize_t locomospi_detectcard(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1);
-+}
-+static DRIVER_ATTR(carddetect, S_IRUGO, locomospi_detectcard, NULL);
-+
-+ssize_t locomospi_writeprotect(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROTECT)>0)?1:0);
-+}
-+static DRIVER_ATTR(cardwriteprotect, S_IRUGO, locomospi_writeprotect, NULL);
-+
-+ssize_t locomospi_showclockbase(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n", spidev->clock_base);
-+}
-+
-+ssize_t locomospi_storeclockbase(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomospi_setclock(simple_strtoul(buf, NULL, 10), spidev->clock_mult);
-+	return count;
-+}
-+static DRIVER_ATTR(clockbase, S_IWUSR | S_IRUGO, locomospi_showclockbase, locomospi_storeclockbase);
-+
-+ssize_t locomospi_showclockmult(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n", spidev->clock_mult);
-+}
-+
-+ssize_t locomospi_storeclockmult(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	locomospi_setclock(spidev->clock_base, simple_strtoul(buf, NULL, 10));
-+	return count;
-+}
-+static DRIVER_ATTR(clockmult, S_IWUSR | S_IRUGO, locomospi_showclockmult, locomospi_storeclockmult);
-+
-+/* debug */
-+
-+ssize_t locomospi_reset(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	int choice = simple_strtoul(buf, NULL, 10);
-+//	char   buff[10];
-+	switch(choice){
-+		case 0: locomospi_reg_release();
-+			locomospi_reg_open();
-+			break;
-+		case 1: tx("\x40\x00\x00\x00\x00\x95",6);
-+			break;
-+		case 2: locomospi_setcs(1);
-+			tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10);
-+			locomospi_setcs(0);
-+			break;
-+		default: /* do nothing */;
-+	}
-+	return count;
-+}
-+static DRIVER_ATTR(reset, S_IWUSR, NULL, locomospi_reset);
-+
-+ssize_t locomospi_showverbose(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "%d\n", verbose);
-+}
-+
-+ssize_t locomospi_storeverbose(struct device_driver *drv, const char *buf, size_t count)
-+{
-+	verbose=simple_strtoul(buf, NULL, 10);
-+	return count;
-+}
-+static DRIVER_ATTR(verbose, S_IWUSR | S_IRUGO, locomospi_showverbose, locomospi_storeverbose);
-+
-+/* SPI functions *************************************************************/
-+
-+static void locomospi_do_transfer(struct work_struct *wrk)
-+{
-+	struct list_head *mptr, *tptr, *mptr2;
-+	struct spi_transfer *entry;
-+	struct spi_message *msg;
-+
-+	list_for_each_safe(mptr, mptr2, &spidev->message_list){
-+		int i;
-+		msg = list_entry(mptr, struct spi_message, queue);
-+
-+		msg->status = 0;
-+		msg->actual_length = 0;
-+		list_for_each(tptr, &msg->transfers){
-+			entry = list_entry(tptr, struct spi_transfer, transfer_list);
-+			if(entry->tx_buf && entry->rx_buf){ //duplex
-+				for(i=0; i< entry->len; i++){
-+					tx(((char*) entry->tx_buf)+i*sizeof(char),1);
-+					rx(((char*) entry->rx_buf)+i*sizeof(char),1);
-+				}
-+				msg->actual_length += entry->len;
-+			} else if(entry->tx_buf && !entry->rx_buf){ //write
-+				tx((char*) entry->tx_buf, entry->len);
-+				msg->actual_length += entry->len;
-+			} else if(!entry->tx_buf && entry->rx_buf){ //read
-+				rx((char*) entry->rx_buf, entry->len);
-+				msg->actual_length += entry->len;
-+			} else if(!entry->tx_buf && !entry->rx_buf){ //error
-+				dev_err(&spidev->sdev->dev, "do_transfer: no buffers allocated\n");
-+				msg->status = -EFAULT;
-+			}
-+		}
-+		spin_lock(&spidev->message_lock);
-+		list_del(mptr);
-+		spin_unlock(&spidev->message_lock);
-+		msg->complete(msg->context);
-+	}
-+}
-+
-+static int locomospi_setup(struct spi_device *spi)
-+{
-+	if((spi->mode & SPI_CS_HIGH) != (spidev->spimode & SPI_CS_HIGH))
-+		locomospi_togglecs();
-+	spidev->spimode = spi->mode;
-+	
-+	if(spi->max_speed_hz == 0)
-+		locomospi_setclock(0, 0);
-+	else if(spi->max_speed_hz >= 25000000)
-+		locomospi_setclock(0, 2);
-+	else if(spi->max_speed_hz >= 22500000)
-+		locomospi_setclock(0, 1);
-+	else if(spi->max_speed_hz >= 12500000)
-+		locomospi_setclock(1, 2);
-+	else if(spi->max_speed_hz >= 10000000)
-+		locomospi_setclock(1, 1);
-+	else if(spi->max_speed_hz >= 9000000)
-+		locomospi_setclock(1, 0);
-+	else if(spi->max_speed_hz >= 6230000)
-+		locomospi_setclock(2, 2);
-+	else if(spi->max_speed_hz >= 5660000)
-+		locomospi_setclock(2, 1);
-+	else if(spi->max_speed_hz >= 4640000)
-+		locomospi_setclock(2, 0);
-+	else if(spi->max_speed_hz >= 3030000)
-+		locomospi_setclock(3, 2);
-+	else if(spi->max_speed_hz >= 2870000)
-+		locomospi_setclock(3, 1);
-+	else if(spi->max_speed_hz >= 2330000)
-+		locomospi_setclock(3, 0);
-+	else if(spi->max_speed_hz >= 383000)
-+		locomospi_setclock(4, 2);
-+	else if(spi->max_speed_hz >= 350000)
-+		locomospi_setclock(4, 1);
-+	else
-+		locomospi_setclock(4, 0);
-+	return 0;
-+}
-+
-+static int locomospi_transfer(struct spi_device *spi, struct spi_message *msg)
-+{
-+
-+	spin_lock(&spidev->message_lock);
-+	list_add_tail(&msg->queue, &spidev->message_list);
-+	spin_unlock(&spidev->message_lock);
-+	schedule_work(&transfer_wq);
-+	return 0;
-+}
-+
-+static struct locomo_driver locomo_spi_driver = {
-+	.drv = {
-+		.name = "locomo-spi",
-+	},
-+	.devid	= LOCOMO_DEVID_SPI,
-+	.probe	= locomospi_probe,
-+	.remove	= locomospi_remove,
-+#ifdef CONFIG_PM
-+	.suspend = locomospi_suspend,
-+	.resume = locomospi_resume,
-+#endif
-+};
-+
-+static struct spi_board_info board = {
-+	.modalias 	= "mmc_spi",
-+	.platform_data 	= (void*) &colliemmc,
-+	.controller_data= NULL,
-+	.irq		= 0,
-+	.max_speed_hz	= 25000000,
-+	.bus_num	= 0,
-+	.chip_select	= 0,
-+	.mode		= 0,
-+};
-+
-+#ifdef CONFIG_PM
-+static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state)
-+{
-+	disable_irq(IRQ_LOCOMO_CARDDETECT);
-+	return 0;
-+}
-+
-+static int locomospi_resume(struct locomo_dev *dev)
-+{
-+	enable_irq(IRQ_LOCOMO_CARDDETECT);
-+	return 0;
-+}
-+#endif
-+
-+static int locomospi_probe(struct locomo_dev *dev)
-+{
-+	int result=0;
-+	printk(KERN_DEBUG "Collie MMC over SPI Driver\n");
-+	spidev=kmalloc(sizeof(struct locomospi_dev),GFP_KERNEL);
-+	if(!spidev){
-+		return -ENOMEM;
-+	}
-+	spidev->ldev = dev;
-+	spidev->card_power = 0;
-+	spidev->spimode = 0;
-+	if(!request_mem_region((unsigned long) dev->mapbase, dev->length, LOCOMO_DRIVER_NAME(dev))) {
-+		dev_err(&dev->dev, " Can't aquire access to io memory\n");
-+		return -EBUSY;
-+	}
-+	spidev->base=(unsigned long) dev->mapbase;
-+
-+	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_POWER, 0);
-+	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_DETECT, 1);
-+	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_WRITE_PROTECT, 1);
-+
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardpower);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_carddetect);
-+	if(result){
-+		dev_err(&dev->dev,"error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardwriteprotect);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spimd);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spict);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spist);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiis);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiwe);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiie);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiir);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spitd);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spird);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spits);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spirs);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_clockbase);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_clockmult);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_reset);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_verbose);
-+	if(result){
-+		dev_err(&dev->dev, "error creating driver attribute\n");
-+		goto region;
-+	}
-+	INIT_WORK(&transfer_wq, locomospi_do_transfer);
-+	INIT_LIST_HEAD(&spidev->message_list);
-+	spin_lock_init(&spidev->message_lock);
-+	init_waitqueue_head(&spidev->waitqueue);
-+	spidev->master=spi_alloc_master(&dev->dev,0);
-+	if(!spidev->master){
-+		result=-ENOMEM;
-+		goto region;
-+	}
-+	spidev->master->bus_num = 0;
-+	spidev->master->num_chipselect = 0;
-+	spidev->master->setup = locomospi_setup;
-+	spidev->master->transfer = locomospi_transfer;
-+	spidev->sdev = spi_new_device(spidev->master, &board);
-+	if(!spidev->sdev){
-+		dev_err(&dev->dev, "failed to register spi device\n");
-+		goto master;
-+	}
-+/*	result=request_irq(IRQ_LOCOMO_SPI_RFR, locomospi_rwready, SA_SHIRQ, "locomo-spi", (void*) spidev);
-+	if(result) {
-+		dev_err(&dev->dev, "Could not get IRQ: RFR\n");
-+		goto regdev;
-+	}
-+	result=request_irq(IRQ_LOCOMO_SPI_RFW, locomospi_rwready, SA_SHIRQ, "locomo-spi", (void*) spidev);
-+	if(result) {
-+		dev_err(&dev->dev, "Could not get IRQ: RFW\n");
-+		goto irq1;
-+	}
-+	result=request_irq(IRQ_LOCOMO_SPI_OVRN, locomospi_testisr, SA_SHIRQ, "locomo-spi", (void*) spidev);
-+	if(result) {
-+		dev_err(&dev->dev, "Could not get IRQ: OVRN\n");
-+		goto irq2;
-+	}*/
-+/*	result=request_irq(IRQ_LOCOMO_SPI_TEND, locomospi_testisr, SA_SHIRQ, "locomo-spi", (void*) spidev);
-+	if(result) {
-+		dev_err(&dev->dev, "Could not get IRQ: TEND\n");
-+		goto irq3;
-+	}*/
-+	locomospi_reg_open();
-+	spidev->workqueue = create_singlethread_workqueue("locomo-spi");
-+	if(!spidev->workqueue){
-+		dev_err(&dev->dev, "failed to create workqueue\n");
-+		goto irq3;
-+	}
-+	result=spi_register_master(spidev->master);
-+	if(result){
-+		dev_err(&dev->dev, "failed to register spimaster\n");
-+		goto wq;
-+	}
-+	return 0;
-+wq:
-+	destroy_workqueue(spidev->workqueue);
-+irq3:
-+//	free_irq(IRQ_LOCOMO_SPI_OVRN, (void*) spidev);
-+//irq2:
-+//	free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev);
-+//irq1:
-+//	free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev);
-+//regdev:
-+	spi_unregister_device(spidev->sdev);
-+master:
-+	spi_master_put(spidev->master);
-+region:
-+	release_mem_region((unsigned long) dev->mapbase, dev->length);
-+	kfree(spidev);
-+	return result;
-+
-+}
-+
-+static int locomospi_remove(struct locomo_dev *dev)
-+{
-+	spi_unregister_device(spidev->sdev);
-+	spi_unregister_master(spidev->master);
-+	destroy_workqueue(spidev->workqueue);
-+	locomospi_reg_release();
-+//	free_irq(IRQ_LOCOMO_SPI_TEND, (void*) spidev);
-+//	free_irq(IRQ_LOCOMO_SPI_OVRN, (void*) spidev);
-+//	free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev);
-+//	free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev);
-+	spi_master_put(spidev->master);
-+	release_mem_region((unsigned long) dev->mapbase, dev->length);
-+	kfree(spidev);
-+	return 0;
-+}
-+
-+
-+
-+static int __init locomospi_init(void)
-+{
-+	int ret = locomo_driver_register(&locomo_spi_driver);
-+	if (ret)
-+		return ret;
-+
-+
-+	return 0;
-+}
-+
-+static void __exit locomospi_exit(void)
-+{
-+	locomo_driver_unregister(&locomo_spi_driver);
-+}
-+
-+module_init(locomospi_init);
-+module_exit(locomospi_exit);
-+
-+MODULE_AUTHOR("Thomas Kunze thommy@tabao.de");
-+MODULE_DESCRIPTION("Collie mmc driver");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21/drivers/spi/locomo_spi.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/drivers/spi/locomo_spi.h	2007-07-03 21:40:52.000000000 +0200
-@@ -0,0 +1,37 @@
-+#include <asm/hardware/locomo.h>
-+#ifndef __LOCOMO_SPI_H__
-+#define __LOCOMO_SPI_H__
-+#define IRQ_LOCOMO_CARDDETECT	IRQ_LOCOMO_GPIO13
-+#define HIGH	1
-+#define LOW	0
-+struct locomospi_dev {
-+	struct locomo_dev *ldev;
-+	struct spi_master *master;
-+	struct spi_device *sdev;
-+	int card_power;
-+	int clock_base;
-+	int clock_mult;
-+	unsigned long base;
-+	u8 spimode;
-+	wait_queue_head_t waitqueue;
-+	struct workqueue_struct *workqueue;
-+	struct list_head message_list;
-+	spinlock_t message_lock;
-+	irqreturn_t (*mmc_spi_isr)(int, void*);
-+};
-+
-+
-+static irqreturn_t 	locomospi_cardisr(int, void*);
-+static int 	locomospi_probe(struct locomo_dev*);
-+static int 	locomospi_remove(struct locomo_dev*);
-+static int 	locomospi_carddetect(void);
-+static void 	locomospi_reg_open(void);
-+static void	locomospi_reg_release(void);
-+static int 	tx(const char*, int);
-+static int 	rx(char *, int);
-+static void	locomospi_togglecs(void);
-+static void 	locomospi_power(int on);
-+static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state);
-+static int locomospi_resume(struct locomo_dev *dev);
-+static void locomospi_setcs(int high);
-+#endif
-Index: linux-2.6.21/drivers/spi/Makefile
-===================================================================
---- linux-2.6.21.orig/drivers/spi/Makefile	2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/drivers/spi/Makefile	2007-07-03 21:41:16.000000000 +0200
-@@ -20,6 +20,7 @@
- obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
- obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
- obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
-+obj-$(CONFIG_SPI_LOCOMO)		+= locomo_spi.o
- # 	... add above this line ...
- 
- # SPI protocol drivers (device/link on bus)
diff --git a/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch b/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch
deleted file mode 100644
index 9e7632fe0a..0000000000
--- a/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Index: linux-2.6.21/arch/arm/common/sharpsl_pm.c
-===================================================================
---- linux-2.6.21.orig/arch/arm/common/sharpsl_pm.c	2007-07-03 21:42:09.000000000 +0200
-+++ linux-2.6.21/arch/arm/common/sharpsl_pm.c	2007-07-03 21:42:57.000000000 +0200
-@@ -28,10 +28,8 @@
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
- #include <asm/irq.h>
--#include <asm/arch/pm.h>
--#include <asm/arch/pxa-regs.h>
--#include <asm/arch/sharpsl.h>
- #include <asm/hardware/sharpsl_pm.h>
-+#include "sharpsl_pm.h"
- 
- /*
-  * Constants
-@@ -153,7 +151,7 @@
- 		sharpsl_pm.battstat.mainbat_percent = percent;
- 	}
- 
--	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %d\n", voltage,
-+	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,
- 			sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);
- 
- 	/* If battery is low. limit backlight intensity to save power. */
-@@ -504,7 +502,7 @@
- 
- static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state)
- {
--	dev_dbg(sharpsl_pm.dev, "Time is: %08x\n",RCNR);
-+	dev_dbg(sharpsl_pm.dev, "Time is: %08lx\n",RCNR);
- 
- 	dev_dbg(sharpsl_pm.dev, "Offline Charge Activate = %d\n",sharpsl_pm.flags & SHARPSL_DO_OFFLINE_CHRG);
- 	/* not charging and AC-IN! */
-@@ -518,28 +516,28 @@
- 
- 	sharpsl_pm.machinfo->presuspend();
- 
--	PEDR = 0xffffffff; /* clear it */
-+	clear_pedr_on_pxa();
- 
- 	sharpsl_pm.flags &= ~SHARPSL_ALARM_ACTIVE;
- 	if ((sharpsl_pm.charge_mode == CHRG_ON) && ((alarm_enable && ((alarm_time - RCNR) > (SHARPSL_BATCHK_TIME_SUSPEND + 30))) || !alarm_enable)) {
--		RTSR &= RTSR_ALE;
-+		enable_alarm_irq();
- 		RTAR = RCNR + SHARPSL_BATCHK_TIME_SUSPEND;
--		dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08x\n",RTAR);
-+		dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08lx\n",RTAR);
- 		sharpsl_pm.flags |= SHARPSL_ALARM_ACTIVE;
- 	} else if (alarm_enable) {
--		RTSR &= RTSR_ALE;
-+		enable_alarm_irq();
- 		RTAR = alarm_time;
--		dev_dbg(sharpsl_pm.dev, "User alarm at: %08x\n",RTAR);
-+		dev_dbg(sharpsl_pm.dev, "User alarm at: %08lx\n",RTAR);
- 	} else {
- 		dev_dbg(sharpsl_pm.dev, "No alarms set.\n");
- 		RTAR = 0;
- 	}
- 
--	pxa_pm_enter(state);
-+	sharpsl_pm_enter(state);
- 
- 	sharpsl_pm.machinfo->postsuspend();
- 
--	dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n",PEDR);
-+	dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n",pedr_on_pxa());
- }
- 
- static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state)
-@@ -572,7 +570,7 @@
- static int corgi_pxa_pm_enter(suspend_state_t state)
- {
- 	unsigned long alarm_time = RTAR;
--	unsigned int alarm_status = ((RTSR & RTSR_ALE) != 0);
-+	unsigned int alarm_status = get_alarm_status();
- 
- 	dev_dbg(sharpsl_pm.dev, "SharpSL suspending for first time.\n");
- 
-@@ -633,7 +631,7 @@
- 	}
- 
- 	temp = get_select_val(buff);
--	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));
-+	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %ld\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));
- 
- 	if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) ||
- 			(!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt)))
-@@ -782,9 +780,9 @@
- 
- static struct pm_ops sharpsl_pm_ops = {
- 	.pm_disk_mode	= PM_DISK_FIRMWARE,
--	.prepare	= pxa_pm_prepare,
-+	.prepare	= sharpsl_pm_prepare,
- 	.enter		= corgi_pxa_pm_enter,
--	.finish		= pxa_pm_finish,
-+	.finish		= sharpsl_pm_finish,
- };
- 
- static int __init sharpsl_pm_probe(struct platform_device *pdev)
-@@ -813,7 +811,7 @@
- 	apm_get_power_status = sharpsl_apm_get_power_status;
- 
- 	pm_set_ops(&sharpsl_pm_ops);
--
-+	printk(KERN_DEBUG "sharpsl register pm_ops\n");
- 	mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
- 
- 	return 0;
-Index: linux-2.6.21/arch/arm/common/sharpsl_pm.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/common/sharpsl_pm.h	2007-07-03 21:42:26.000000000 +0200
-@@ -0,0 +1,78 @@
-+
-+#ifdef CONFIG_ARCH_PXA
-+#	include <asm/arch/pm.h>
-+#	include <asm/arch/pxa-regs.h>
-+#	include <asm/arch/sharpsl.h>
-+static inline void clear_pedr_on_pxa(void)
-+{
-+	PEDR = 0xffffffff; /* clear it */
-+}
-+
-+static inline void enable_alarm_irq(void)
-+{
-+	RTSR &= RTSR_ALE;
-+}
-+
-+static inline int pedr_on_pxa(void)
-+{
-+	return PEDR;
-+}
-+
-+static inline int get_alarm_status(void)
-+{
-+	return ((RTSR & RTSR_ALE) != 0);
-+}
-+
-+static inline int sharpsl_pm_enter(suspend_state_t state)
-+{
-+	return pxa_pm_enter(state);
-+}
-+static inline int sharpsl_pm_prepare(suspend_state_t state)
-+{
-+	return pxa_pm_prepare(state);
-+}
-+
-+int sharpsl_pm_finish(suspend_state_t state)
-+{
-+	return pxa_pm_finish(state);
-+}
-+#endif
-+
-+#ifdef CONFIG_ARCH_SA1100
-+#	include <asm/arch/SA-1100.h>
-+extern int sa11x0_pm_enter(suspend_state_t state);
-+
-+static inline void clear_pedr_on_pxa(void) {}
-+static inline void enable_alarm_irq(void) {}
-+static inline int pedr_on_pxa(void)
-+{
-+	return GPLR;
-+}
-+
-+static inline int get_alarm_status(void)
-+{
-+	return 1;
-+}
-+
-+static inline int  sharpsl_pm_enter(suspend_state_t state)
-+{
-+	return  sa11x0_pm_enter(state);
-+}
-+
-+static inline int sharpsl_pm_prepare(suspend_state_t state)
-+{
-+	switch (state) {
-+		case PM_SUSPEND_MEM:
-+		case PM_SUSPEND_STANDBY:
-+			return 0;
-+		default:
-+			return -EINVAL;
-+	}
-+}
-+
-+int sharpsl_pm_finish(suspend_state_t state)
-+{
-+	return 0;
-+}
-+#endif
-+
-Index: linux-2.6.21/arch/arm/mach-sa1100/pm.c
-===================================================================
---- linux-2.6.21.orig/arch/arm/mach-sa1100/pm.c	2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/arch/arm/mach-sa1100/pm.c	2007-07-03 21:42:26.000000000 +0200
-@@ -54,7 +54,7 @@
- };
- 
- 
--static int sa11x0_pm_enter(suspend_state_t state)
-+int sa11x0_pm_enter(suspend_state_t state)
- {
- 	unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
- 	struct timespec delta, rtc;
-@@ -128,6 +128,7 @@
- 
- 	return 0;
- }
-+EXPORT_SYMBOL(sa1x00_pm_enter);
- 
- unsigned long sleep_phys_sp(void *sp)
- {
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index cd347cb674..3ded7ec467 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -11,6 +11,7 @@ DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
 
 inherit kernel
 
+KERNEL_IMAGETYPE_alix = "bzImage"
 KERNEL_IMAGETYPE_progear = "bzImage"
 KERNEL_IMAGETYPE_simpad = "zImage"
 KERNEL_IMAGETYPE_kb9202 = "uImage"
diff --git a/packages/linux/linux/alix/.mtn2git_empty b/packages/linux/linux/alix/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux/alix/.mtn2git_empty
diff --git a/packages/linux/linux/alix/defconfig b/packages/linux/linux/alix/defconfig
new file mode 100644
index 0000000000..c1c82931bb
--- /dev/null
+++ b/packages/linux/linux/alix/defconfig
@@ -0,0 +1,1787 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.22
+# Tue Aug  7 15:04:11 2007
+#
+CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+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"
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_SMP is not set
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_PARAVIRT is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+CONFIG_MGEODE_LX=y
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_XADD=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MINIMUM_CPU_MODEL=4
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+# CONFIG_X86_MCE_P4THERMAL is not set
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_VMSPLIT_3G is not set
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_NR_QUICK=1
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_KEXEC is not set
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_COMPAT_VDSO is not set
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SLEEP_PROC_FS=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+# CONFIG_ACPI_BUTTON is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_ACPI_CPUFREQ=m
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+# CONFIG_X86_POWERNOW_K8 is not set
+CONFIG_X86_GX_SUSPMOD=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_LONGRUN is not set
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_HT_IRQ is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP 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=y
+# 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 is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# 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
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# 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 is not set
+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=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# 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_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+
+#
+# Plug and Play support
+#
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+CONFIG_PATA_CS5535=y
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_RHINE_NAPI=y
+# CONFIG_SC92031 is not set
+# CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+CONFIG_USB_ZD1201=m
+# CONFIG_HOSTAP is not set
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+# CONFIG_USB_NET_AX8817X is not set
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+# CONFIG_USB_BELKIN is not set
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# 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_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_UINPUT is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+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
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+CONFIG_HW_RANDOM_GEODE=y
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+CONFIG_CS5535_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+# CONFIG_HPET_RTC_IRQ is not set
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_SCx200_ACB=m
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP 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
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83627HF=m
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# 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
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_HECUBA is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_GX=y
+# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
+# CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_SELECT=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+CONFIG_SND_CS5535AUDIO=m
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+# CONFIG_EDAC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+# CONFIG_RTC_INTF_PROC is not set
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# Auxiliary Display support
+#
+# CONFIG_KS0108 is not set
+
+#
+# Virtualization
+#
+# CONFIG_KVM is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+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=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# 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=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=m
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BIND34=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_NCP_FS is not set
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf-8"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+CONFIG_NLS_CODEPAGE_852=m
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+CONFIG_NLS_CODEPAGE_1250=m
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
+CONFIG_DOUBLEFAULT=y
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Hardware crypto devices
+#
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_CRYPTO_DEV_GEODE=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_KTIME_SCALAR=y
diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb
new file mode 100644
index 0000000000..b4e18dd5e1
--- /dev/null
+++ b/packages/linux/linux_2.6.22.bb
@@ -0,0 +1,14 @@
+require linux.inc
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_alix = "1"
+DEFAULT_PREFERENCE_avr32 = "1"
+
+PR = "r1"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
+           file://defconfig \
+	   "
+
+SRC_URI_append_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.22.atmel.3.patch.bz2;patch=1"
diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb
index c159333539..9912ddbf30 100644
--- a/packages/meta/meta-gpephone.bb
+++ b/packages/meta/meta-gpephone.bb
@@ -1,9 +1,8 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 RDEPENDS = "\
-    gpe-base-depends \
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index a129d15aee..93e0b47456 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+RDEPENDS = "libedata-cal"
 PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
 
 inherit openmoko2 gtk-icon-cache 
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 8bf39d8af9..f2a108b712 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
-    gpephone-base-depends \
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
@@ -12,9 +11,6 @@ PACKAGES = "\
     gpephone-task-apps \
     gpephone-task-development"
 
-RDEPENDS_gpephone-base-depends = "\
-    virtual/libx11"
-
 RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
     gpe-terminal \
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 06c15c14c2..d7a07a7d00 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -73,8 +73,10 @@ do_deploy () {
 	for mach in ${UBOOT_MACHINES}
 	do
 		install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+		ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
 		if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
 			install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+			ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
 		fi
 	done
 	install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage