Merge branch 'master' of git://git.denx.de/u-boot-arm

MAKEALL

@@ -545,6 +545,7 @@ LIST_ARM11="		\
 	apollon			\
 	imx31_litekit		\
 	imx31_phycore		\
+	imx31_phycore_eet	\
 	mx31ads			\
 	qong			\
 	smdk6400		\

include/configs/omap3_beagle.h

@@ -98,6 +98,11 @@
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
+#define CONFIG_CMD_MTDPARTS	/* Enable MTD parts commands */
+#define MTDIDS_DEFAULT			"nand0=nand"
+#define MTDPARTS_DEFAULT		"mtdparts=nand:512k(x-loader),"\
+					"1920k(u-boot),128k(u-boot-env),"\
+					"4m(kernel),-(fs)"
 
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/