From d32c98e0ee9477afad8ff4eaa072c2caa0f05742 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Jul 2007 08:08:32 +0000 Subject: motorola ezx phones: add an include that sets the basic stuff, remove killswitch from a1200, e680 because the machines need different defconfigs --- conf/machine/a1200.conf | 7 ++++-- conf/machine/a780.conf | 34 +----------------------------- conf/machine/e680.conf | 7 ++++-- conf/machine/include/motorola-ezx-base.inc | 33 +++++++++++++++++++++++++++++ conf/machine/rokr-e2.conf | 28 ++---------------------- 5 files changed, 46 insertions(+), 63 deletions(-) create mode 100644 conf/machine/include/motorola-ezx-base.inc (limited to 'conf') diff --git a/conf/machine/a1200.conf b/conf/machine/a1200.conf index 3914d0e8f4..f2ce2b6bf5 100644 --- a/conf/machine/a1200.conf +++ b/conf/machine/a1200.conf @@ -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 diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index 1820569c2b..f2ce2b6bf5 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -2,36 +2,4 @@ #@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" -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" +require conf/machine/include/motorola-ezx-base.inc diff --git a/conf/machine/e680.conf b/conf/machine/e680.conf index c1cb10ca2a..f2ce2b6bf5 100644 --- a/conf/machine/e680.conf +++ b/conf/machine/e680.conf @@ -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 diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc new file mode 100644 index 0000000000..c1eac82e3b --- /dev/null +++ b/conf/machine/include/motorola-ezx-base.inc @@ -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" diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf index 53be3506af..ccd496c03d 100644 --- a/conf/machine/rokr-e2.conf +++ b/conf/machine/rokr-e2.conf @@ -2,32 +2,8 @@ #@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" -- cgit v1.2.3