merge of 008eb71d2c280e1f5c511b697e1376dda71d5eef

     and 61329a2030536aebd4f09b262832d612b83a3f03

7 files changed, 72 insertions, 8 deletions

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
new file mode 100644
index 0000000000..9181b36c19
--- /dev/null
+++ b/conf/machine/a780.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX A780 and E680
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780 and E680
+
+include conf/machine/include/motorola-ezx.conf
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n --no-idea-yet --CAUTION"
+
+# EXTRA_IMAGEDEPENDS += "ezx-updater"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 040f00a6e2..b1e620882d 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -5,7 +5,7 @@
 INHERIT += "linux_modules"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_ARCHS = "all arm armv4t ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
@@ -32,4 +32,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
 #can be used for crunch support later on
-#include conf/machine/tune-ep9312.conf
+#include conf/machine/include/tune-ep9312.conf
+
+
+include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 126a19569c..0fc8a1ef95 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 ROOT_FLASH_SIZE = "32"
+PCMCIA_MANAGER = "pcmciautils"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
new file mode 100644
index 0000000000..cde37556ce
--- /dev/null
+++ b/conf/machine/include/motorola-ezx.conf
@@ -0,0 +1,40 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+IMAGE_FSTYPES = "ext2.gz jffs2"
+
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw apm irda-utils udev-utils ppp ppp-dialin module-init-tools "
+
+#
+# disable all modules until we have something that boots...
+#
+
+# Ethernet modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+#                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+#                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#
+# USB Gadget Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+#                             kernel-module-g-serial kernel-module-g-ether"
+#
+# Sound Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+#BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc 
+#                              kernel-module-snd-timer kernel-module-snd-pcm  \
+#                              kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+#                             
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 66d3eb38ff..07753ccf64 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 #use this for a hx2xxx ipaq
 #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
-
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 ROOT_FLASH_SIZE = "80"
@@ -21,6 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -e 256KiB -p"
 
 MODUTILS = "26"	
+PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
@@ -34,7 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
@@ -47,7 +45,7 @@ HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pc
                   hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 
-
+module_autoload_evdev = "evdev"
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
 module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 604748b0ed..a171a21393 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -18,3 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 
+
+
+
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index eb44107ecd..a6439783f3 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -35,9 +35,9 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
 USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
-ROOT_FLASH_SIZE = "24"
+ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
-GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop"
+GPE_EXTRA_INSTALL += "suspend-desktop"
 
 include conf/machine/include/handheld-common.conf
 include conf/machine/include/tune-strongarm.conf