merge of af4df6cf6c1c2920365147ec393e688fdb85b6de

     and c8459c74f176dc141188b488b5c3e56beb6ebf13

10 files changed, 178 insertions, 50 deletions

diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
new file mode 100644
index 0000000000..2bb392759a
--- /dev/null
+++ b/conf/distro/ezx.conf
@@ -0,0 +1,71 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: EZX <http://www.openezx.org>
+#@DESCRIPTION: A Linux Distribution for Motorola GSM phones
+#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
+#@--------------------------------------------------------------------
+
+DISTRO_NAME = "OpenEZX"
+DISTRO_VERSION = ".dev-snapshot-${DATE}"
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+include conf/distro/openzaurus.conf
+
+
+#FEED_URIS += " \
+#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
+
+SRCDATE = "20060507"
+
+PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
+
+KERNEL_CONSOLE = "ttyS0"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+# fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+#
+# Base
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+# ezx-kernel has problems with newer g++ atm.
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+OPIE_VERSION = "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
+include conf/distro/preferred-gpe-versions-2.8.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 8b40c5811a..e42456672c 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -55,8 +55,10 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 # Opie
 #
 
-#OPIE_VERSION = "1.2.1"
-#include conf/distro/preferred-opie-versions.inc
+OPIE_VERSION = "1.2.2"
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+include conf/distro/preferred-opie-versions.inc
 
 #
 # GPE
diff --git a/conf/distro/opensimpad-0.9.0.conf b/conf/distro/opensimpad-0.9.0.conf
deleted file mode 100644
index e73c7f902c..0000000000
--- a/conf/distro/opensimpad-0.9.0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-DISTRO = "opensimpad"
-DISTRO_NAME = "OpenSIMpad"
-DISTRO_VERSION = "0.9.0-rc2-${DATE}"
-
-include conf/distro/openzaurus-3.5.4.conf
-
diff --git a/conf/distro/opensimpad.conf b/conf/distro/opensimpad.conf
deleted file mode 100644
index dc66621768..0000000000
--- a/conf/distro/opensimpad.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenSIMpad
-#@DESCRIPTION: Distribution configuration for OpenSIMpad (http://www.opensimpad.org)
-
-INHERIT += " package_ipk debian"
-TARGET_OS ?= "linux"
-TARGET_FPU ?= "soft"
-
-PARALLEL_INSTALL_MODULES = "1"
-
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 1419ca9317..1e77bdae92 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -20,7 +20,7 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-SRCDATE = "20060507"
+SRCDATE = "20060514"
 #
 # Zaurus
 #
@@ -47,9 +47,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 # Opie
 #
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
+#QTE_VERSION = "2.3.10"
+#OPIE_VERSION = "1.2.2"
+#PALMTOP_USE_MULTITHREADED_QT = "yes"
 include conf/distro/preferred-opie-versions.inc
 
 #
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index ca35c83796..607acad858 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
 # Specify which versions of E-related libraries and applications to build
 #
 
-PREFERRED_VERSION_e = "0.16.999.025"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
-PREFERRED_VERSION_ecore-native = "0.9.9.025"
-PREFERRED_VERSION_edb = "1.0.5.006"
-PREFERRED_VERSION_edb-native = "1.0.5.006"
-PREFERRED_VERSION_edje = "0.5.0.025"
-PREFERRED_VERSION_edje-native = "0.5.0.025"
-PREFERRED_VERSION_eet = "0.9.10.025"
-PREFERRED_VERSION_eet-native = "0.9.10.025"
-PREFERRED_VERSION_embryo = "0.9.1.025"
-PREFERRED_VERSION_embryo-native = "0.9.1.025"
-PREFERRED_VERSION_emotion = "0.0.1.004"
-PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.006"
-PREFERRED_VERSION_epsilon = "0.3.0.006"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
-PREFERRED_VERSION_evas-x11 = "0.9.9.025"
-PREFERRED_VERSION_evas-native = "0.9.9.025"
-PREFERRED_VERSION_ewl = "0.0.4.006"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
-PREFERRED_VERSION_imlib2-native = "1.2.1.011"
-PREFERRED_VERSION_e-wm = "0.16.999.025"
-PREFERRED_VERSION_entrance = "0.9.0.006"
+#PREFERRED_VERSION_e = "0.16.999.025"
+#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+#PREFERRED_VERSION_ecore-native = "0.9.9.025"
+#PREFERRED_VERSION_edb = "1.0.5.006"
+#PREFERRED_VERSION_edb-native = "1.0.5.006"
+#PREFERRED_VERSION_edje = "0.5.0.025"
+#PREFERRED_VERSION_edje-native = "0.5.0.025"
+#PREFERRED_VERSION_eet = "0.9.10.025"
+#PREFERRED_VERSION_eet-native = "0.9.10.025"
+#PREFERRED_VERSION_embryo = "0.9.1.025"
+#PREFERRED_VERSION_embryo-native = "0.9.1.025"
+#PREFERRED_VERSION_emotion = "0.0.1.004"
+#PREFERRED_VERSION_emotion-native = "0.0.1.004"
+#PREFERRED_VERSION_epeg = "0.9.0.006"
+#PREFERRED_VERSION_epsilon = "0.3.0.006"
+#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+#PREFERRED_VERSION_evas-native = "0.9.9.025"
+#PREFERRED_VERSION_ewl = "0.0.4.006"
+#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+#PREFERRED_VERSION_e-wm = "0.16.999.025"
+#PREFERRED_VERSION_entrance = "0.9.0.006"
 
 PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index 5811856e55..51c9937628 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -1,4 +1,11 @@
 #
+# Default versions
+QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+#
+#
 # Opie libraries
 #
 PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 6578cbe7f5..3977f50e2b 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -1,7 +1,28 @@
 #@TYPE: Machine
-#@NAME: Motorola EZX
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780
+#@NAME: Motorola EZX A780
+#@DESCRIPTION: Machine configuration for the Motorola GSM phone A780
 
-include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
 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"
+
+#cat /proc/mtd
+#dev:    size   erasesize  name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+ROOT_FLASH_SIZE = "24"
+
+# 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/e680.conf b/conf/machine/e680.conf
new file mode 100644
index 0000000000..ae8915632e
--- /dev/null
+++ b/conf/machine/e680.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX E680
+#@DESCRIPTION: Machine configuration for the Motorola GSM phone E680
+
+require conf/machine/a780.conf
+
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
index 70418805f5..cde37556ce 100644
--- a/conf/machine/include/motorola-ezx.conf
+++ b/conf/machine/include/motorola-ezx.conf
@@ -1,2 +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"
+#