# 
# old_revision [a51a2e5532264f836e170c84dbb2f4a509afa26a]
# 
# patch "conf/machine/akita.conf"
#  from [cb07da10ff48df80f6f38074c74c8d2200a4c34b]
#    to [8d9e28bfe230988c4525812ab9a25a5ad59d3d3d]
# 
# patch "conf/machine/include/zaurus-2.6.conf"
#  from [eaf2b718cd12e2d78c0c7e142f7b930f51049982]
#    to [068c88b1e4a46520b1ffc021fd14df04fb45563f]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [078aba2b35bef7468016ac75b74c2a4b9d670562]
#    to [701af8ec6aa6800f18a1e570e2d4f0f3e353261c]
# 
# patch "conf/machine/poodle.conf"
#  from [98d691b84ca32adabb38692269c609d583154022]
#    to [3b5c0685355ea21e05c2ab652753d1a261c9c398]
# 
# patch "conf/machine/spitz.conf"
#  from [15ef27bf0d171f8e74c1a054528000d3af11e593]
#    to [5487b0941509824d0676e2de0a977daded552b8d]
# 
# patch "conf/machine/tosa.conf"
#  from [e35f703089600002a8a2d8d1bd940331841ffba5]
#    to [8cad5eb6722ea47f4942bc647007207ca8d43828]
# 
 akita.conf                    |    1 -
 include/zaurus-2.6.conf       |   29 +++++++++++++++++++++++++----
 include/zaurus-clamshell.conf |   17 ++---------------
 poodle.conf                   |   16 ----------------
 spitz.conf                    |    4 ----
 tosa.conf                     |   18 ------------------
 6 files changed, 27 insertions(+), 58 deletions(-)
============================================================
--- conf/machine/akita.conf	cb07da10ff48df80f6f38074c74c8d2200a4c34b
+++ conf/machine/akita.conf	8d9e28bfe230988c4525812ab9a25a5ad59d3d3d
@@ -6,6 +6,5 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 include conf/machine/include/zaurus-2.6.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
-IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
============================================================
--- conf/machine/include/zaurus-2.6.conf	eaf2b718cd12e2d78c0c7e142f7b930f51049982
+++ conf/machine/include/zaurus-2.6.conf	068c88b1e4a46520b1ffc021fd14df04fb45563f
@@ -1,8 +1,27 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
 # Don't forget to include zaurus-clamshell.conf as well
 
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+
+MACHINE_KERNEL_VERSION = "2.6"
+require conf/machine/include/zaurus-2.6.conf
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+EXTRA_IMAGEDEPENDS += "zaurus-updater"
+
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
+# 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"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
@@ -12,9 +31,11 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd"
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
 MACHINE_EXTRA_RDEPENDS = "zaurusd"
-MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
-MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi"
+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"
============================================================
--- conf/machine/include/zaurus-clamshell.conf	078aba2b35bef7468016ac75b74c2a4b9d670562
+++ conf/machine/include/zaurus-clamshell.conf	701af8ec6aa6800f18a1e570e2d4f0f3e353261c
@@ -1,11 +1,5 @@
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
-
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
@@ -15,13 +9,6 @@ EXTRA_IMAGECMD_jffs2 += "&& sumtool -i $
 EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                          -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
                          --eraseblock=0x4000 -l -p"
+
 IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
 		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
-
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-# 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"
============================================================
--- conf/machine/poodle.conf	98d691b84ca32adabb38692269c609d583154022
+++ conf/machine/poodle.conf	3b5c0685355ea21e05c2ab652753d1a261c9c398
@@ -1,23 +1,7 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-
-MACHINE_KERNEL_VERSION = "2.6"
 require conf/machine/include/zaurus-2.6.conf
 
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
-
-EXTRA_IMAGEDEPENDS += "zaurus-updater"
-
 ROOT_FLASH_SIZE = "22"
-
-# 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"
-
============================================================
--- conf/machine/spitz.conf	15ef27bf0d171f8e74c1a054528000d3af11e593
+++ conf/machine/spitz.conf	5487b0941509824d0676e2de0a977daded552b8d
@@ -5,11 +5,7 @@ include conf/machine/include/zaurus-2.6.
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
 
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
 IMAGE_FSTYPES ?= "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
============================================================
--- conf/machine/tosa.conf	e35f703089600002a8a2d8d1bd940331841ffba5
+++ conf/machine/tosa.conf	8cad5eb6722ea47f4942bc647007207ca8d43828
@@ -1,28 +1,10 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-
-MACHINE_KERNEL_VERSION = "2.6"
-
 include conf/machine/include/zaurus-2.6.conf
 
 # wlan-ng Modules
 MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
-EXTRA_IMAGEDEPENDS += "zaurus-updater"
-
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 ROOT_FLASH_SIZE = "28"
-
-# 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"