17 files changed, 17 insertions, 1 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 4c3112df78..add4c7e2d9 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 SERIAL_CONSOLE = "115200"
 
 # used by some images
+IMAGE_FSTYPES ?= "jffs2"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 07616915aa..ba0c9f9a70 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index b6ccd7ef0d..3b9d5188f6 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index bf45d25c43..95c7626a63 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
-
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index 532193a567..f875d437c7 100644
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -41,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \
 				kernel-module-af-key \
 				kernel-module-i2c-pxa"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index ad0c64bef2..bfaf5ed793 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -36,6 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools
diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf
index af64a31d8b..ac4c1ef4b6 100644
--- a/conf/machine/gesbc-9302.conf
+++ b/conf/machine/gesbc-9302.conf
@@ -19,6 +19,7 @@ SERIAL_CONSOLE = "57600 ttyAM0"
 # used by some images
 ROOT_FLASH_SIZE = "8"
 #extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index da88b1494f..a9945acd34 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -22,6 +22,7 @@ MACHINE_DISPLAY_PPI = "180"
 
 ROOT_FLASH_SIZE = "24"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
index 3dc19a4a31..ffec67b699 100644
--- a/conf/machine/omap1510inn.conf
+++ b/conf/machine/omap1510inn.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 3dc19a4a31..ffec67b699 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 9a97150981..98e3a7d3e5 100644
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index 82be4e3f79..343b0091b5 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
index 39e6896b3b..0e6b646897 100644
--- a/conf/machine/omap2430sdp.conf
+++ b/conf/machine/omap2430sdp.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index abd50b116a..7a7b5c1a60 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -11,6 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 # PREFERRED_VERSION_u-boot = "1.1.6"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 ROOT_FLASH_SIZE = "29"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..3b9165d2b8 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-z"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttySA0 115200 vt100"
diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index 2dbe3ea863..0275f6b2f5 100644
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "triton-kernel"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "38400 ttyS0"
diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf
index 9cc47cdef7..4d5909126a 100644
--- a/conf/machine/xxs1500.conf
+++ b/conf/machine/xxs1500.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "mipsel"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0xa00000 --little-endian --eraseblock=0x20000 -n"
 
 # does not gain any speed and just creates problems: