summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-31 16:47:57 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-31 16:47:57 +0000
commit1c72612d1954d8e6c60f591befce4cd71cbe0caf (patch)
treeb382a54d9c6d31d07608a99266475122e9c410bc
parent1629a57a55fde399fa006fb337dca2587e3d45e5 (diff)
update ezx machine configurations
-rw-r--r--conf/machine/a780.conf8
-rw-r--r--conf/machine/e680.conf8
-rw-r--r--conf/machine/include/motorola-ezx.conf6
3 files changed, 8 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...