merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

13 files changed, 208 insertions, 25 deletions

diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
index 576846fbdf..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.conf
@@ -5,4 +5,4 @@
 #
 
 # LAB can only resolve relative symlinks
-ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
index eab879368c..f22ffce6c2 100644
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.conf
@@ -1,4 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
+
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
new file mode 100644
index 0000000000..064db79b29
--- /dev/null
+++ b/conf/machine/include/lsppc.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine configuration
+#@Name: Buffalo PPC Linkstations
+#@DESCRIPTION: Generic Machine configuration for ppc based linkstations
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+TARGET_FPU = "hard"
+
+USE_DEVFS = "0"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
+
+#don't try to access tty1
+USE_VT = "0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+
+#tune for the MPC5200B cpu
+require conf/machine/include/tune-ppc603e.conf
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/include/palm.conf b/conf/machine/include/palm.conf
new file mode 100644
index 0000000000..821ebc4c03
--- /dev/null
+++ b/conf/machine/include/palm.conf
@@ -0,0 +1,86 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-module-ac97-bus \
+	kernel-module-apm-power \
+	kernel-module-backlight \
+	kernel-module-battery \
+	kernel-module-led-class \
+	kernel-module-lcd \
+	kernel-module-gpioed \
+	kernel-module-gpioed-ng \
+	kernel-module-external-power \
+	kernel-module-snd \
+	kernel-module-snd-ac97-codec \
+	kernel-module-snd-page-alloc \
+	kernel-module-snd-pcm \
+	kernel-module-snd-seq \
+	kernel-module-snd-seq-device \
+	kernel-module-snd-seq-midi-event \
+	kernel-module-snd-seq-oss \
+	kernel-module-snd-timer \
+	kernel-module-soundcore \
+	"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
index 06eb56d2b6..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.conf
@@ -1,9 +1,14 @@
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
 
+MACHINE_FEATURES_append = "kernel24"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
+	kernel-module-sa1100usb-core kernel-module-usb-eth \
+	kernel-module-pcnet-cs kernel-module-8390 "
+
+USE_DEVFS = "1"
+
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules  \
- pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
-
-USE_DEVFS = "1"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index 69f04f0730..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,5 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"
diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.conf
new file mode 100644
index 0000000000..dff8dce684
--- /dev/null
+++ b/conf/machine/include/tune-ppc440.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf
new file mode 100644
index 0000000000..0cfa50c69e
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440fp"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc
index 4e9e6a2ad9..a9702cfce2 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
@@ -28,7 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
-MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
+MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
@@ -38,6 +38,32 @@ MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
+    mkdir ${IMAGE_NAME}-installkit/
+
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+ 
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
+}
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
deleted file mode 100644
index 93325d253b..0000000000
--- a/conf/machine/include/zaurus-clamshell.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
-		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
new file mode 100644
index 0000000000..f66502eff1
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -0,0 +1,13 @@
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"