[oe-commits] org.oe.dev motorola ezx phones: add an include that sets the basic stuff, remove killswitch from a1200, e680 because the machines need different defconfigs

[koen commit]

motorola ezx phones: add an include that sets the basic stuff, remove killswitch from a1200, e680 because the machines need different defconfigs

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6c8b1580aa9fa11de0305809eb2269ea9806768d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6c8b1580aa9fa11de0305809eb2269ea9806768d
Files:
1
conf/machine/include/motorola-ezx-base.inc
conf/machine/a1200.conf
conf/machine/a780.conf
conf/machine/e680.conf
conf/machine/rokr-e2.conf
Diffs:

#
# mt diff -r2c419480f9183be6f5210a0387978f15d06e78ec -r6c8b1580aa9fa11de0305809eb2269ea9806768d
#
# 
# 
# add_file "conf/machine/include/motorola-ezx-base.inc"
#  content [0667c6b496dfb760566158b9fbbd7d6d278b90a6]
# 
# patch "conf/machine/a1200.conf"
#  from [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/a780.conf"
#  from [0b4ea0352725660f6f5612a0c0cb267b0274953e]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/e680.conf"
#  from [987ace20df2d1dc626ea26f22b62e9dc7289adc5]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/rokr-e2.conf"
#  from [3c78073478e131d6f10f163a67a8c03cd4fa6593]
#    to [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
# 
============================================================
--- conf/machine/include/motorola-ezx-base.inc	0667c6b496dfb760566158b9fbbd7d6d278b90a6
+++ conf/machine/include/motorola-ezx-base.inc	0667c6b496dfb760566158b9fbbd7d6d278b90a6
@@ -0,0 +1,33 @@
+
+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 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
+
+SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/a1200.conf	a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd
+++ conf/machine/a1200.conf	4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-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')}"
+#@TYPE: Machine
+#@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
+
+require conf/machine/include/motorola-ezx-base.inc
============================================================
--- conf/machine/a780.conf	0b4ea0352725660f6f5612a0c0cb267b0274953e
+++ conf/machine/a780.conf	4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,37 +1,5 @@
 #@TYPE: Machine
 #@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
 
+require conf/machine/include/motorola-ezx-base.inc
-
-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 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
-
-SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/e680.conf	987ace20df2d1dc626ea26f22b62e9dc7289adc5
+++ conf/machine/e680.conf	4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-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')}"
+#@TYPE: Machine
+#@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
+
+require conf/machine/include/motorola-ezx-base.inc
============================================================
--- conf/machine/rokr-e2.conf	3c78073478e131d6f10f163a67a8c03cd4fa6593
+++ conf/machine/rokr-e2.conf	0d6bee13f804137fbb6e3564ed46b0422b8dc682
@@ -1,33 +1,9 @@
 #@TYPE: Machine
 #@NAME: Motorola EZX rokr e2 
 #@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
 
+require conf/machine/include/motorola-ezx-base.inc
 
-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"
-
+#no 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 
-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"