[oe-commits] org.oe.dev a780, a1200: remove duplication and use new device tables

[koen commit]

a780, a1200: remove duplication and use new device tables

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3221506b31bea1ddd95349fca1f2337f7c75d057
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3221506b31bea1ddd95349fca1f2337f7c75d057
Files:
1
conf/machine/a1200.conf
conf/machine/a780.conf
Diffs:

#
# mt diff -rfea55c0efe307066003d32abecc9e022ecf15e7d -r3221506b31bea1ddd95349fca1f2337f7c75d057
#
# 
# 
# patch "conf/machine/a1200.conf"
#  from [8f4d9472a6772564c56024f3fc194d381ed08122]
#    to [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
# 
# patch "conf/machine/a780.conf"
#  from [70915a802063d6cda418a2667b1bbd5476dd2366]
#    to [0b4ea0352725660f6f5612a0c0cb267b0274953e]
# 
============================================================
--- conf/machine/a1200.conf	8f4d9472a6772564c56024f3fc194d381ed08122
+++ conf/machine/a1200.conf	a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd
@@ -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')}"
============================================================
--- conf/machine/a780.conf	70915a802063d6cda418a2667b1bbd5476dd2366
+++ conf/machine/a780.conf	0b4ea0352725660f6f5612a0c0cb267b0274953e
@@ -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 @@ MACHINE_FEATURES = "kernel26 touchscreen
 
 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