a780, a1200: remove duplication and use new device tables

diff --git a/conf/machine/a1200.conf b/conf/machine/a1200.conf
index 684238b..3914d0e 100644 (file)
--- a/conf/machine/a1200.conf
+++ b/conf/machine/a1200.conf
@@ -1,33 +1,2 @@
-#@TYPE: Machine
-#@NAME: Motorola EZX A1200
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200
-
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-#cat /proc/mtd
-#dev:    size   erasesize  name
-#mtd0: 00020000 00008000 "Bootloader"
-#mtd1: 000e0000 00020000 "Kernel"
-#mtd2: 00580000 00020000 "VFM_Filesystem"
-#mtd3: 00020000 00020000 "Logo"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
-#the a780 needs a userspace daemon to stop the BP from shutting down the phone 
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
-ROOT_FLASH_SIZE = "24"
-
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Motorola EZX A1200,\n*    because \
+of the similarities between A780 and A1200 series. Use MACHINE = \"a780\".\n*\n*\n')}"

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 85beb45..1820569 100644 (file)
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
 
 
 TARGET_ARCH = "arm"
@@ -20,13 +20,17 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
 
-#the a780 needs a userspace daemon to stop the BP from shutting down the phone 
+#the EZX phones need a userspace daemon to stop the BP from shutting down the phone 
 MACHINE_EXTRA_RDEPENDS += "opentapi"
 
 ROOT_FLASH_SIZE = "24"
 
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
 
+# Opentapi needs to be started very early so we need the mux devices in static /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table-ezx.txt"
+
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf