diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-06-01 22:52:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-01 22:52:43 +0000 |
| commit | aa27b6f89d69864e710637d7411a7a1bcf5a537e (patch) | |
| tree | f19ab7ff533a2342bf4307aeec07b3dfbf40ae79 /packages/linux | |
| parent | 6f82620c320b6a61c08ffcf80f703841d0f6b30e (diff) | |
| parent | 11d10b76a70aedd9136101fc081dc968d3d7a110 (diff) | |
merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
and cc55c113a93ff0cca026956716e79f0fecb52ad2
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-ezx/e680-disable-boomer-HACK.patch | 16 | ||||
| -rw-r--r-- | packages/linux/linux-ezx/e680-keypad-compile-HACK.patch | 42 | ||||
| -rw-r--r-- | packages/linux/linux-ezx_2.6.16.13.bb | 2 |
3 files changed, 60 insertions, 0 deletions
diff --git a/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch b/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch new file mode 100644 index 0000000000..a0d953ddfb --- /dev/null +++ b/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- linux-2.6.16/drivers/i2c/chips/Makefile~e680-disable-boomer 2006-05-31 18:52:44.000000000 +0200 ++++ linux-2.6.16/drivers/i2c/chips/Makefile 2006-05-31 18:56:38.000000000 +0200 +@@ -17,7 +17,7 @@ + + obj-$(CONFIG_I2C_ADCM2700) += e680_camera.o + obj-$(CONFIG_I2C_A780_CAMERA) += a780_camera.o +-obj-$(CONFIG_PXA_EZX_E680) += boomer.o ++//obj-$(CONFIG_PXA_EZX_E680) += boomer.o + + ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) + EXTRA_CFLAGS += -DDEBUG diff --git a/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch b/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch new file mode 100644 index 0000000000..47d07db695 --- /dev/null +++ b/packages/linux/linux-ezx/e680-keypad-compile-HACK.patch @@ -0,0 +1,42 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-keypad-compile-fix.patch 2006-05-31 18:47:58.000000000 +0200 ++++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-05-31 18:51:57.000000000 +0200 +@@ -404,24 +404,20 @@ + KEYPAD_NONE, + }; + #elif defined(CONFIG_PXA_EZX_E680) +-#error "kbd matrix still needs to be converted to new row/col layout" + static unsigned char ezx_keycode[] = { +- /* col 0 */ +- KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0, +- /* col 1 */ +- KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0, +- /* col 2 */ +- 0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0, +- /* col 3 */ +- KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0, ++ /* row 0 */ ++ KEY_KPENTER, KEY_MENU, KEY_CANCEL, KEY_PAGEUP, KEY_UP, ++ /* row 1 */ ++ KEY_KP1, KEY_KP2, KEY_KP3, KEY_ENTER, KEY_KPENTER, /*center joypad */ ++ /* row 2 */ ++ KEY_KP4, KEY_KP5, KEY_KP6, KEY_PAGEDOWN, KEY_PHONE, ++ /* row 3 */ ++ KEY_KP7, KEY_KP8, KEY_KP9, KEY_PHONE, KEY_LEFT, ++ /* row 4 */ ++ KEY_KPASTERISK, KEY_KP0, KEY_KPDOT, KEY_PAGEDOWN, KEY_DOWN, + }; + static unsigned char ezx_direct_keycode[] = { + KEY_CAMERA, +- KEYPAD_NONE, +- KEYPAD_NONE, +- KEYPAD_A, +- KEY_POWER, +- KEYPAD_B, + }; + #elif defined(CONFIG_PXA_EZX_A780) + static unsigned char ezx_keycode[] = { diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 4f5f0b7c3f..1f0ce506db 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -18,6 +18,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-ezx" SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-exz6-symlink-fix.tar.bz2 \ file://touchscreen-fix-r0.patch;patch=1 \ + file://e680-keypad-compile-HACK.patch;patch=1 \ + file://e680-disable-boomer-HACK.patch;patch=1 \ file://defconfig-a780 \ file://defconfig-e680" S = "${WORKDIR}/linux-2.6.16" |