zaurus machines: Clean up IPKG_EXTRA_ARCHS and IMAGE_FSTPES (from poky)

6 files changed, 12 insertions, 5 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 005a70e664..0358864c70 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -4,6 +4,8 @@
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
+
+IPKG_EXTRA_ARCHS += "iwmmxt" 
+IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 0bd9623526..4b1d8edb80 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,5 +5,7 @@
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index f85c2a1221..97728fa5b6 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -14,7 +14,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 # add a summary to the jffs2 file to make it mount a lot faster
 EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                          -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                          --eraseblock=0x4000 -l -p"
+                         --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"
 
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index fa3675fb59..d6281e3016 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 			  -e 256KiB -p"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 MODUTILS = "26"	
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index edd7213346..eee389faf1 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -21,6 +21,8 @@ include conf/machine/include/tune-arm926ejs.conf
 ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # serial console port on devboard rev. B3
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 3d80a41486..b8851f6170 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,15 +5,14 @@
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
-
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
 BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
-IMAGE_FSTYPES = "jffs2 tar.gz"
+IPKG_EXTRA_ARCHS += "iwmmxt"
+IMAGE_FSTYPES ?= "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
 # actually that should really read ROOTFS_SIZE = "100", because with modern kernels,