Index: configure-files/common/AC_common
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/common/AC_common,v
retrieving revision 1.82.4.1
diff -b -u -p -r1.82.4.1 AC_common
--- configure-files/common/AC_common	17 Oct 2008 12:26:59 -0000	1.82.4.1
+++ configure-files/common/AC_common	26 May 2010 11:50:00 -0000
@@ -252,7 +252,6 @@ config BOOTLOADER_SIZE
 
 config MEDIA_BLOCKSIZE
 	hex "Flash memory block size (bytes)"
-	depends on NANDFLASH
 	default 0x4000
 	help
 	  Enter the block size of the flash memory used. See the data sheet
Index: configure-files/common/common
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/common/common,v
retrieving revision 1.626.2.10
diff -b -u -p -r1.626.2.10 common
--- configure-files/common/common	12 Dec 2008 13:00:59 -0000	1.626.2.10
+++ configure-files/common/common	26 May 2010 11:50:00 -0000
@@ -148,7 +148,8 @@ if [ "$AXIS_CONFIG_PARTITION_TABLE" = "y
     partition fstab  type="$AXIS_CONFIG_FS_TYPE_RWFS"   dev=/dev/part/rwfsblock \
                      mpoint=/mnt/flash mopts=noauto pass=2 \
               ptable             name=flash2 csum=no save=yes \
-                     size="$AXIS_CONFIG_PARTITION_TABLE_FLASH2_SIZE"
+                     size="$AXIS_CONFIG_PARTITION_TABLE_FLASH2_SIZE"\
+                     mbsize="$AXIS_CONFIG_MEDIA_BLOCKSIZE"
   fi
   partition   fstab  type=proc   dev=proc        mpoint=/proc
   if [ "$AXIS_CONFIG_PRODUCTION_TEST_FIRMWARE" = "y" ]; then
Index: configure-files/devboard/products/devboard_82/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/devboard_82/defconfig,v
retrieving revision 1.5
diff -b -u -p -r1.5 defconfig
--- configure-files/devboard/products/devboard_82/defconfig	17 Oct 2008 14:09:31 -0000	1.5
+++ configure-files/devboard/products/devboard_82/defconfig	26 May 2010 11:50:00 -0000
@@ -31,6 +31,7 @@ AXIS_CONFIG_PROCESSOR_etrax_100lx=y
 # AXIS_CONFIG_PROCESSOR_artpecb is not set
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #
Index: configure-files/devboard/products/devboard_82+/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/devboard_82+/defconfig,v
retrieving revision 1.17
diff -b -u -p -r1.17 defconfig
--- configure-files/devboard/products/devboard_82+/defconfig	17 Oct 2008 14:09:31 -0000	1.17
+++ configure-files/devboard/products/devboard_82+/defconfig	26 May 2010 11:50:00 -0000
@@ -31,6 +31,7 @@ AXIS_CONFIG_PROCESSOR_etrax_100lx=y
 # AXIS_CONFIG_PROCESSOR_artpecb is not set
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #
Index: configure-files/devboard/products/fox_416/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/fox_416/defconfig,v
retrieving revision 1.6
diff -b -u -p -r1.6 defconfig
--- configure-files/devboard/products/fox_416/defconfig	5 Nov 2008 10:46:33 -0000	1.6
+++ configure-files/devboard/products/fox_416/defconfig	26 May 2010 11:50:00 -0000
@@ -31,6 +31,7 @@ AXIS_CONFIG_PROCESSOR_etrax_100lx=y
 # AXIS_CONFIG_PROCESSOR_artpecb is not set
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #
Index: configure-files/devboard/products/fox_832/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/fox_832/defconfig,v
retrieving revision 1.6
diff -b -u -p -r1.6 defconfig
--- configure-files/devboard/products/fox_832/defconfig	5 Nov 2008 10:44:16 -0000	1.6
+++ configure-files/devboard/products/fox_832/defconfig	26 May 2010 11:50:00 -0000
@@ -31,6 +31,7 @@ AXIS_CONFIG_PROCESSOR_etrax_100lx=y
 # AXIS_CONFIG_PROCESSOR_artpecb is not set
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #
Index: configure-files/devboard/products/fs_nor/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/fs_nor/defconfig,v
retrieving revision 1.4
diff -b -u -p -r1.4 defconfig
--- configure-files/devboard/products/fs_nor/defconfig	17 Oct 2008 14:09:32 -0000	1.4
+++ configure-files/devboard/products/fs_nor/defconfig	26 May 2010 11:50:00 -0000
@@ -32,6 +32,7 @@ AXIS_CONFIG_PROCESSOR_etrax_fs=y
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
 # AXIS_CONFIG_NANDFLASH is not set
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #
Index: configure-files/devboard/products/mcm4_16/defconfig
===================================================================
RCS file: /usr/local/cvs/linux/configure-files/devboard/products/mcm4_16/defconfig,v
retrieving revision 1.3
diff -b -u -p -r1.3 defconfig
--- configure-files/devboard/products/mcm4_16/defconfig	17 Oct 2008 14:09:32 -0000	1.3
+++ configure-files/devboard/products/mcm4_16/defconfig	26 May 2010 11:50:00 -0000
@@ -31,6 +31,7 @@ AXIS_CONFIG_PROCESSOR_etrax_100lx=y
 # AXIS_CONFIG_PROCESSOR_artpecb is not set
 # AXIS_CONFIG_PROCESSOR_argus2 is not set
 AXIS_CONFIG_NUMBER_OF_PROCESSORS=1
+AXIS_CONFIG_MEDIA_BLOCKSIZE=0x10000
 AXIS_CONFIG_PARTITION_TABLE=y
 
 #