update ezx machine configurations

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 0b33e34..b40d7fa 100644 (file)
--- 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 ae89156..c1cb10c 100644 (file)
--- 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 998add6..e87f6aa 100644 (file)
--- 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...