summaryrefslogtreecommitdiff
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-06-15 14:46:18 +0000
committerRichard Purdie <richard@openedhand.com>2006-06-15 14:46:18 +0000
commit22cd91206ed18233a83feaf7668485854a4ab4f4 (patch)
tree4b3e395f97a813554bbeec366acb2011ba961a26 /openembedded
parent7b663c1ac26daad55eb71c9cb75b531251446c88 (diff)
downloadopenembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.tar.gz
openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.tar.bz2
openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.zip
linux-oz-2.6: Sync with OE. Includes .bb cleanup, patch classification and poky specific logo handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@484 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch45
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff107
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-akita7
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x014
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-collie15
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa27013
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle11
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm3
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz7
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa14
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch9
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/integrator_rgb-r0.patch13
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch48
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch11
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch49
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/oh-logo.patch99662
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch4173
-rw-r--r--openembedded/packages/linux/linux-openzaurus.inc43
-rw-r--r--openembedded/packages/linux/linux-openzaurus_2.6.16.bb117
19 files changed, 4506 insertions, 99855 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch
new file mode 100644
index 0000000000..20432b404a
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch
@@ -0,0 +1,45 @@
+Platform: Sharp Zaurus C760 running 2.6.16 and pcmciautils 013.
+
+root@c7x0:~# pccardctl ident
+Socket 0:
+ product info: "Pretec", "CompactWLAN Card 802.11b", "2.5"
+ manfid: 0x0156, 0x0002
+ function: 6 (network)
+
+==========================================================================
+From: Jochen Friedrich
+
+Yet another card known to work OK with hostap_cs:
+
+# pccardctl ident
+Socket 0:
+ no product info available
+Socket 1:
+ product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
+ manfid: 0x0156, 0x0002
+ function: 6 (network)
+
+==========================================================================
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+ drivers/net/wireless/hostap/hostap_cs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: linux/drivers/net/wireless/hostap/hostap_cs.c
+===================================================================
+--- linux.orig/drivers/net/wireless/hostap/hostap_cs.c 2006-05-17 10:23:00.000000000 +0200
++++ linux/drivers/net/wireless/hostap/hostap_cs.c 2006-05-17 10:25:45.000000000 +0200
+@@ -923,6 +923,12 @@
+ PCMCIA_DEVICE_PROD_ID12(
+ "ZoomAir 11Mbps High", "Rate wireless Networking",
+ 0x273fe3db, 0x32a1eaee),
++ PCMCIA_DEVICE_PROD_ID123(
++ "Pretec", "CompactWLAN Card 802.11b", "2.5",
++ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
++ PCMCIA_DEVICE_PROD_ID123(
++ "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
++ 0xc7b8df9d, 0x1700d087, 0x4b74baa0),
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff b/openembedded/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff
deleted file mode 100644
index b90ead9e4f..0000000000
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-Add more IDs for PCMCIA cards
-
-From: Pavel Roskin <proski@gnu.org>
-
-Add string IDs for cards that were covered by 0x0156,0x0002, which is no
-longer used in hostap_cs due to conflict with Orinoco cards.
-
-Also add more IDs for cards that are supported by linux-wlan-ng. Thanks
-to Arnold Schulz <arnysch@gmx.net> for providing the list.
-
-Signed-off-by: Pavel Roskin <proski@gnu.org>
----
-
- drivers/net/wireless/hostap/hostap_cs.c | 46 +++++++++++++++++++++++++++++++
- 1 files changed, 46 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
-index 55bed92..9ac1aec 100644
---- a/drivers/net/wireless/hostap/hostap_cs.c
-+++ b/drivers/net/wireless/hostap/hostap_cs.c
-@@ -832,9 +832,11 @@ static int hostap_cs_resume(struct pcmci
- static struct pcmcia_device_id hostap_cs_ids[] = {
- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
-+ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002),
- PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
- PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
- PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
-+ PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008),
- PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
- PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
- PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
-@@ -844,7 +846,10 @@ static struct pcmcia_device_id hostap_cs
- PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
- PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
- PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
-+ PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021),
-+ PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008),
- PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
-+ PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
- PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
- PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
- PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
-@@ -862,22 +867,63 @@ static struct pcmcia_device_id hostap_cs
- "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
- 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
- PCMCIA_DEVICE_PROD_ID123(
-+ "Belkin", "11Mbps Wireless Notebook Network Adapter",
-+ "Version 01.02", 0x3805a391, 0xad4c7744, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID123(
- "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
- 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
- PCMCIA_DEVICE_PROD_ID123(
- "Instant Wireless ", " Network PC CARD", "Version 01.02",
- 0x11d901af, 0x6e9bd926, 0x4b74baa0),
- PCMCIA_DEVICE_PROD_ID123(
-+ "Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P",
-+ 0x4b801a17, 0xf222ec2d, 0x630d52b2),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02",
-+ 0xfea54c90, 0x48f2bdd6, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "Pretec", "CompactWLAN Card 802.11b", "2.5",
-+ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
-+ PCMCIA_DEVICE_PROD_ID123(
- "SMC", "SMC2632W", "Version 01.02",
- 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "The Linksys Group, Inc.", "Instant Wireless Network PC Card",
-+ "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
-+ 0xc7b8df9d, 0x1700d087, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25",
-+ 0x78fc06ee, 0xdb9aa842),
-+ PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25",
-+ 0x78fc06ee, 0x45a50c1e),
- PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G",
- 0x2decece3, 0x82067c18),
- PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
- 0x54f7c49c, 0x15a75e5b),
-+ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11",
-+ 0x5261440f, 0xa6405584),
-+ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11",
-+ 0x5261440f, 0xdf6115f9),
-+ PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card",
-+ 0x71b18589, 0xf144e3ac),
-+ PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100",
-+ 0xfdd73470, 0xe0b6f146),
- PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
- 0x74c5e40d, 0xdb472a18),
-+ PCMCIA_DEVICE_PROD_ID12("LeArtery",
-+ "SYNCBYAIR 11Mbps Wireless LAN PC Card",
-+ 0x7e3b326a, 0x49893e92),
- PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
- 0x0733cc81, 0x0c52f395),
-+ PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card",
-+ 0xa37434e9, 0x9762e8f1),
-+ PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card",
-+ 0x4ac44287, 0x235a6bed),
-+ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110",
-+ 0x209f40ab, 0xd9715264),
-+ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110",
-+ 0x209f40ab, 0x46263178),
- PCMCIA_DEVICE_PROD_ID12(
- "ZoomAir 11Mbps High", "Rate wireless Networking",
- 0x273fe3db, 0x32a1eaee),
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-akita b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-akita
index d91cde2bd8..967371c661 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-akita
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-akita
@@ -740,6 +740,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -1376,6 +1379,10 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
index 694a0d5793..602e69ee34 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16
-# Thu Mar 23 22:03:05 2006
+# Mon May 22 09:00:01 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -753,6 +753,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -991,7 +994,10 @@ CONFIG_FONT_8x16=y
#
# Logo configuration
#
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_DEVICE=y
@@ -1409,6 +1415,10 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
index 1400c2ea69..20ec01ff21 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
@@ -35,7 +35,7 @@ CONFIG_SYSCTL=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_UID16=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
@@ -256,8 +256,8 @@ CONFIG_SYN_COOKIES=y
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
# CONFIG_IPV6 is not set
@@ -588,6 +588,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_TSDEV=y
CONFIG_INPUT_TSDEV_SCREEN_X=240
@@ -953,7 +956,7 @@ CONFIG_INOTIFY=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"
@@ -989,6 +992,10 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
index b78ee75a98..2b1299116c 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
@@ -205,7 +205,7 @@ CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
CONFIG_APM=y
@@ -578,8 +578,8 @@ CONFIG_INPUT=y
#
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_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -627,8 +627,7 @@ CONFIG_SERIAL_PXA_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
@@ -854,6 +853,10 @@ CONFIG_JFFS2_RTIME=y
CONFIG_JFFS2_SUMMARY=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
index 5336e66e83..a909387adc 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
@@ -762,6 +762,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -1023,13 +1026,13 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x8 is not set
# CONFIG_FONT_8x16 is not set
# 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_MINI_4x6=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
@@ -1359,6 +1362,10 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
index 0941b83f90..33891f8bf8 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
@@ -579,8 +579,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz
index f542435c47..ddb8a8aeae 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz
@@ -740,6 +740,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -1376,6 +1379,10 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
index ed4cfd8cb3..4302f47e15 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
@@ -230,7 +230,7 @@ CONFIG_BINFMT_MISC=m
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
CONFIG_APM=y
@@ -753,6 +753,9 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -991,7 +994,10 @@ CONFIG_FONT_8x8=y
#
# Logo configuration
#
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_DEVICE=y
@@ -1409,6 +1415,10 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
index 3d5d197920..6f77d51dee 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
@@ -4,6 +4,12 @@ The ident for Seagate 8GB microdrive is
hash 0x76dc4190, 0xcfba9599
manfid 0x0111, 0x0000
+CF card:
+ product info: "SAMSUNG", "04/05/06", "", ""
+ manfid : 0x0000, 0x0000
+ function 4 (fixed disk)
+
+
Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
drivers/ide/legacy/ide-cs.c | 1 +
@@ -13,11 +19,12 @@ Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
===================================================================
--- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200
+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200
-@@ -444,6 +444,7 @@
+@@ -444,6 +444,8 @@
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/integrator_rgb-r0.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/integrator_rgb-r0.patch
deleted file mode 100644
index db2f34a3eb..0000000000
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/integrator_rgb-r0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linux-2.6.16/arch/arm/mach-integrator/integrator_cp.c
-===================================================================
---- linux-2.6.16.orig/arch/arm/mach-integrator/integrator_cp.c 2006-03-20 05:53:29.000000000 +0000
-+++ linux-2.6.16/arch/arm/mach-integrator/integrator_cp.c 2006-05-24 21:57:49.000000000 +0100
-@@ -454,7 +454,7 @@
- .width = -1,
- .height = -1,
- .tim2 = TIM2_BCD | TIM2_IPC,
-- .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1),
-+ .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1) | CNTL_BGR,
- .bpp = 16,
- .grayscale = 0,
- };
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
new file mode 100644
index 0000000000..8b296780d4
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
@@ -0,0 +1,48 @@
+--- linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-11 18:15:17.392063008 +0200
++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c.ok 2006-05-11 18:14:55.870334808 +0200
+@@ -44,24 +44,29 @@
+
+ #define LOCOMOKBD_NUMKEYS 128
+
+-#define KEY_ACTIVITY KEY_F16
+-#define KEY_CONTACT KEY_F18
+-#define KEY_CENTER KEY_F15
++
++#define LOCOMO_KEY_CALENDER KEY_F1
++#define LOCOMO_KEY_ADDRESS KEY_F2
++#define LOCOMO_KEY_CANCEL KEY_F4
++#define LOCOMO_KEY_CENTER KEY_F5
++#define LOCOMO_KEY_MAIL KEY_F10
++#define LOCOMO_KEY_OK KEY_F11
++#define LOCOMO_KEY_MENU KEY_F12
+
+ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
+- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
+- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */
+- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
+- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */
+- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */
+- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */
+- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
+- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
+- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
+- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
+- KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
++ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
++ KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
++ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */
++ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
++ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */
++ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, LOCOMO_KEY_OK, 0, 0, /* 60 - 69 */
++ KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */
++ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
++ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
++ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
++ KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
++ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
+ };
+
+ #define KB_ROWS 16
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
new file mode 100644
index 0000000000..6408ef9551
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig 2006-05-14 13:24:01.354435088 +0200
++++ linux-2.6.16/drivers/video/backlight/locomolcd.c 2006-05-14 13:24:11.920828752 +0200
+@@ -201,7 +201,7 @@
+ return PTR_ERR (locomolcd_bl_device);
+
+ /* Set up frontlight so that screen is readable */
+- locomobl_data.brightness = 2;
++ locomobl_data.brightness = 3;
+ locomolcd_set_intensity(locomolcd_bl_device);
+
+ return 0;
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
new file mode 100644
index 0000000000..7e233277da
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
@@ -0,0 +1,49 @@
+--- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig 2006-05-13 22:53:33.810228656 +0200
++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-13 22:56:56.544408376 +0200
+@@ -45,17 +45,20 @@
+ #define LOCOMOKBD_NUMKEYS 128
+
+
+-#define LOCOMO_KEY_CALENDER KEY_F1
+-#define LOCOMO_KEY_ADDRESS KEY_F2
+-#define LOCOMO_KEY_CANCEL KEY_F4
+-#define LOCOMO_KEY_CENTER KEY_F5
+-#define LOCOMO_KEY_MAIL KEY_F10
+-#define LOCOMO_KEY_OK KEY_F11
++#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL
++#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */
++#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */
+ #define LOCOMO_KEY_MENU KEY_F12
++#define LOCOMO_KEY_MAIL KEY_F10
++#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */
++#define LOCOMO_KEY_CANCEL KEY_POWER
++#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */
++
++#define LOCOMO_KEY_FN KEY_F9
+
+ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
+- 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
+- KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
++ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
++ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
+ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */
+ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
+@@ -65,7 +68,7 @@
+ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
+ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
+ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
+- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
++ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
+ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
+ };
+
+@@ -76,7 +79,7 @@
+ #define NR_SCANCODES 128
+
+ #define KB_DELAY 8
+-#define SCAN_INTERVAL (HZ/10)
++#define SCAN_INTERVAL (HZ/20)
+ #define LOCOMOKBD_PRESSED 1
+
+ struct locomokbd {
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/oh-logo.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/oh-logo.patch
deleted file mode 100644
index 1d83ab2233..0000000000
--- a/openembedded/packages/linux/linux-openzaurus-2.6.16/oh-logo.patch
+++ /dev/null
@@ -1,99662 +0,0 @@
-Index: linux-2.6.16/drivers/video/logo/Kconfig
-===================================================================
---- linux-2.6.16.orig/drivers/video/logo/Kconfig 2006-03-20 05:53:29.000000000 +0000
-+++ linux-2.6.16/drivers/video/logo/Kconfig 2006-05-22 22:04:14.000000000 +0100
-@@ -25,6 +25,11 @@
- depends on LOGO
- default y
-
-+config LOGO_OHAND_CLUT224
-+ bool "Standard 224-color OpenedHand logo"
-+ depends on LOGO
-+ default y
-+
- config LOGO_DEC_CLUT224
- bool "224-color Digital Equipment Corporation Linux logo"
- depends on LOGO && (MACH_DECSTATION || ALPHA)
-Index: linux-2.6.16/drivers/video/logo/Makefile
-===================================================================
---- linux-2.6.16.orig/drivers/video/logo/Makefile 2006-03-20 05:53:29.000000000 +0000
-+++ linux-2.6.16/drivers/video/logo/Makefile 2006-05-22 22:04:33.000000000 +0100
-@@ -13,6 +13,8 @@
- obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
-+obj-$(CONFIG_LOGO_OHAND_CLUT224) += logo_oh_clut224.o
-+
-
- # How to generate logo's
-
-Index: linux-2.6.16/drivers/video/logo/logo.c
-===================================================================
---- linux-2.6.16.orig/drivers/video/logo/logo.c 2006-03-20 05:53:29.000000000 +0000
-+++ linux-2.6.16/drivers/video/logo/logo.c 2006-05-22 23:28:19.000000000 +0100
-@@ -34,7 +34,7 @@
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
--
-+extern const struct linux_logo logo_oh_clut224;
-
- const struct linux_logo *fb_find_logo(int depth)
- {
-@@ -102,6 +102,10 @@
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
- #endif
-+#ifdef CONFIG_LOGO_OHAND_CLUT224
-+ /* Opededhand logo */
-+ logo = &logo_oh_clut224;
-+#endif
- }
- return logo;
- }
-Index: linux-2.6.16/drivers/video/logo/logo_oh_clut224.ppm
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.16/drivers/video/logo/logo_oh_clut224.ppm 2006-05-22 22:00:45.000000000 +0100
-@@ -0,0 +1,99604 @@
-+P3
-+# CREATOR: The GIMP's PNM Filter Version 1.0
-+332 100
-+255
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0
-+0
-+2
-+0