merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc

     and cc55c113a93ff0cca026956716e79f0fecb52ad2

6 files changed, 68 insertions, 14 deletions

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 0b33e3478e..b40d7fa7fa 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -1,8 +1,8 @@
 #@TYPE: Machine
-#@NAME: Motorola EZX A780
-#@DESCRIPTION: Machine configuration for the Motorola GSM phone A780
+#@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i
 
-include conf/machine/include/motorola-ezx.conf
+require conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
@@ -20,7 +20,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 ROOT_FLASH_SIZE = "24"
 
-# EXTRA_IMAGEDEPENDS += "ezx-updater"
+EXTRA_IMAGEDEPENDS += "ezx-boot-over-usb-native"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/e680.conf b/conf/machine/e680.conf
index ae8915632e..c1cb10ca2a 100644
--- a/conf/machine/e680.conf
+++ b/conf/machine/e680.conf
@@ -1,6 +1,2 @@
-#@TYPE: Machine
-#@NAME: Motorola EZX E680
-#@DESCRIPTION: Machine configuration for the Motorola GSM phone E680
-
-require conf/machine/a780.conf
-
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Motorola EZX E680,\n*    because \
+of the similarities between A780 and E680-clamshell series. Use MACHINE = \"a780\".\n*\n*\n')}"
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
index 998add6341..e87f6aa70f 100644
--- a/conf/machine/include/motorola-ezx.conf
+++ b/conf/machine/include/motorola-ezx.conf
@@ -1,13 +1,11 @@
 # choose the proper kernel for this hardware
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
 # we don't need support for kernel 2.4
 MODUTILS = "26"
 # build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
 IMAGE_FSTYPES = "tar.gz jffs2"
 
-BOOTSTRAP_EXTRA_DEPENDS  += "ezx-boot-usb-native"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools ezx-gpiotool"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
 
 #
 # disable all modules until we have something that boots...
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"