linux-nokia800: merge with Poky - suspend/resume support, more filesystems

r3899: linux-nokia800: added ext2/ext3/fuse/nfs/cifs into kernel - tested on device
r3838: linux-nokia800: Add suspend/resume button support
r3271: linux-nokia800: Stage extra header, enable APM

3 files changed, 132 insertions, 14 deletions

diff --git a/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig b/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
index b1af97af35..52ee1b10ce 100644
--- a/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
+++ b/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-omap1
-# Wed Feb  6 17:40:31 2008
+# Tue Mar  4 12:08:53 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -752,6 +752,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_POWER=y
 
 #
 # Input Device Drivers
@@ -1357,19 +1358,19 @@ CONFIG_CBUS_RETU_HEADSET=y
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+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=m
+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=m
+CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1384,7 +1385,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=y
 
 #
 # CD-ROM/DVD Filesystems
@@ -1396,7 +1397,7 @@ CONFIG_DNOTIFY=y
 # DOS/FAT/NT Filesystems
 #
 CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
+# CONFIG_MSDOS_FS is not set
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -1449,10 +1450,26 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1494,7 +1511,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
+CONFIG_NLS_ISO8859_2=y
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
 # CONFIG_NLS_ISO8859_5 is not set
@@ -1566,7 +1583,47 @@ CONFIG_SECURITY_LOWMEM=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
 
 #
 # Library routines
diff --git a/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch b/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
new file mode 100644
index 0000000000..791a66e02a
--- /dev/null
+++ b/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
@@ -0,0 +1,60 @@
+Index: linux-2.6.21/drivers/cbus/retu-pwrbutton.c
+===================================================================
+--- linux-2.6.21.orig/drivers/cbus/retu-pwrbutton.c	2008-02-20 22:44:18.000000000 +0000
++++ linux-2.6.21/drivers/cbus/retu-pwrbutton.c	2008-02-20 22:46:22.000000000 +0000
+@@ -53,7 +53,9 @@
+ 		state = PWRBTN_PRESSED;
+ 
+ 	if (pwrbtn_state != state) {
+-		input_report_key(pwrbtn_dev, KEY_POWER, state);
++		input_report_key(pwrbtn_dev, KEY_SUSPEND, state);
++		if (state == PWRBTN_PRESSED)
++			input_event(pwrbtn_dev, EV_PWR, KEY_SUSPEND, 1);
+ 		pwrbtn_state = state;
+ 	}
+ }
+@@ -92,8 +94,8 @@
+ 	if (!pwrbtn_dev)
+ 		return -ENOMEM;
+ 
+-	pwrbtn_dev->evbit[0] = BIT(EV_KEY);
+-	pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER);
++	pwrbtn_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
++	pwrbtn_dev->keybit[LONG(KEY_SUSPEND)] = BIT(KEY_SUSPEND);
+ 	pwrbtn_dev->name = "retu-pwrbutton";
+ 
+ 	input_register_device(pwrbtn_dev);
+Index: linux-2.6.21/drivers/char/apm-emulation.c
+===================================================================
+--- linux-2.6.21.orig/drivers/char/apm-emulation.c	2008-02-21 00:32:41.000000000 +0000
++++ linux-2.6.21/drivers/char/apm-emulation.c	2008-02-21 00:33:43.000000000 +0000
+@@ -206,10 +206,18 @@
+ 	return ret;
+ }
+ 
++static in_suspend;
++
+ static void apm_suspend(void)
+ {
+ 	struct apm_user *as;
+-	int err = pm_suspend(PM_SUSPEND_MEM);
++	int err;
++
++	in_suspend = 1;
++
++	err = pm_suspend(PM_SUSPEND_MEM);
++
++	in_suspend = 0;
+ 
+ 	/*
+ 	 * Anyone on the APM queues will think we're still suspended.
+@@ -663,6 +671,9 @@
+ {
+ 	unsigned long flags;
+ 
++	if (in_suspend)
++		return;
++
+ 	spin_lock_irqsave(&kapmd_queue_lock, flags);
+ 	queue_add_event(&kapmd_queue, event);
+ 	spin_unlock_irqrestore(&kapmd_queue_lock, flags);
diff --git a/packages/linux/linux-nokia800_2.6.21-osso71.bb b/packages/linux/linux-nokia800_2.6.21-osso71.bb
index 34cc82a842..8f87ed0011 100644
--- a/packages/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/packages/linux/linux-nokia800_2.6.21-osso71.bb
@@ -1,11 +1,12 @@
 require linux-nokia800.inc
-PR = "r1"
+PR = "r4"
 
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_nokia800 = "1"
+DEFAULT_PREFERENCE_nokia770 = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
 	   http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \
+           http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \
+	   file://suspend-button.patch;patch=1 \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.21"