Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / fx12mm.h

diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index 5844567..e825c21 100644 (file)
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -37,7 +37,9 @@
 
 /* cmd config */
 #define CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #undef CONFIG_CMD_NET
 
 /* sdram */