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

16 years ago · 99a4ffe202
parent e2b66fe453 0c6926736e
commit 99a4ffe202
2 changed files with 15 additions and 9 deletions
--- a/19
+++ b/19
@ -539,15 +539,16 @@ LIST_ARM10="		\
 #########################################################################
 ## ARM11 Systems
 #########################################################################
-LIST_ARM11="		\
-	cp1136		\
-	omap2420h4	\
-	apollon		\
-	imx31_litekit	\
-	imx31_phycore	\
-	mx31ads		\
-	qong		\
-	smdk6400	\
+LIST_ARM11="			\
+	cp1136			\
+	omap2420h4		\
+	apollon			\
+	imx31_litekit		\
+	imx31_phycore		\
+	imx31_phycore_eet	\
+	mx31ads			\
+	qong			\
+	smdk6400		\
 "

 #########################################################################
--- a/include/configs/omap3_beagle.h
+++ b/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			*/