diff --git a/include/configs/mx6sabreandroid_common.h b/include/configs/mx6sabreandroid_common.h
index ae23923b901bc3690c67c939e520e13fd83c6ffb..02d3bf81fdd3950561a0c663af5f70971c4944fd 100644
--- a/include/configs/mx6sabreandroid_common.h
+++ b/include/configs/mx6sabreandroid_common.h
@@ -63,6 +63,9 @@
 	"initrd_high=0xffffffff\0" \
 
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#ifdef CONFIG_FASTBOOT_STORAGE_NAND
+#define CONFIG_USB_FASTBOOT_BUF_SIZE   0x25000000
+#else
 #define CONFIG_USB_FASTBOOT_BUF_SIZE   0x19000000
-
+#endif
 #endif /* MX6_SABRE_ANDROID_COMMON_H */
diff --git a/include/configs/mx6slevkandroid.h b/include/configs/mx6slevkandroid.h
index 1eaf78a4da16575471ceac6e63da35a1f8f85660..1f2f0e55d1bd51c594f7eff2c1da24453230c5ad 100644
--- a/include/configs/mx6slevkandroid.h
+++ b/include/configs/mx6slevkandroid.h
@@ -71,6 +71,9 @@
 	"initrd_high=0xffffffff\0" \
 
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#ifdef CONFIG_FASTBOOT_STORAGE_NAND
+#define CONFIG_USB_FASTBOOT_BUF_SIZE   0x25000000
+#else
 #define CONFIG_USB_FASTBOOT_BUF_SIZE   0x19000000
-
+#endif
 #endif
diff --git a/include/configs/mx6sxsabreautoandroid.h b/include/configs/mx6sxsabreautoandroid.h
index 7cebe49d9f65c1a6af0fad6ced5f716aeb2c70e4..a03512bd8abf75c54bc1feb7a5c25632d5201ccb 100644
--- a/include/configs/mx6sxsabreautoandroid.h
+++ b/include/configs/mx6sxsabreautoandroid.h
@@ -62,6 +62,9 @@
 	"initrd_high=0xffffffff\0" \
 
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#ifdef CONFIG_FASTBOOT_STORAGE_NAND
+#define CONFIG_USB_FASTBOOT_BUF_SIZE   0x25000000
+#else
 #define CONFIG_USB_FASTBOOT_BUF_SIZE   0x19000000
-
+#endif
 #endif
diff --git a/include/configs/mx6sxsabresdandroid.h b/include/configs/mx6sxsabresdandroid.h
index 7d8c64e56fdf638e5a153d48a94c2d17f7105a01..41f1297e970759f05697a265537fd911e0eb5926 100644
--- a/include/configs/mx6sxsabresdandroid.h
+++ b/include/configs/mx6sxsabresdandroid.h
@@ -54,7 +54,10 @@
 	"initrd_high=0xffffffff\0" \
 
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#ifdef CONFIG_FASTBOOT_STORAGE_NAND
+#define CONFIG_USB_FASTBOOT_BUF_SIZE   0x25000000
+#else
 #define CONFIG_USB_FASTBOOT_BUF_SIZE   0x19000000
-
+#endif
 
 #endif
diff --git a/include/configs/mx7dsabresdandroid.h b/include/configs/mx7dsabresdandroid.h
index c8518a68dde1d634d67225effe38a3a10ecb4b66..74112d8d6e1f332702c89b8e47a10357de3b6139 100644
--- a/include/configs/mx7dsabresdandroid.h
+++ b/include/configs/mx7dsabresdandroid.h
@@ -54,7 +54,10 @@
 
 
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#ifdef CONFIG_FASTBOOT_STORAGE_NAND
+#define CONFIG_USB_FASTBOOT_BUF_SIZE   0x25000000
+#else
 #define CONFIG_USB_FASTBOOT_BUF_SIZE   0x19000000
-
+#endif
 
 #endif