summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-03-26 22:21:48 +0100
committerWolfgang Denk <wd@denx.de>2009-03-26 22:21:48 +0100
commit99a4ffe202d8bc1d3c4faff9b8258b686ef656ca (patch)
tree95efc845e9f0632af352711cc475ff426f6f17b9
parente2b66fe453a3679f807b37fc5923d89214302764 (diff)
parent0c6926736effbb9a19047949b7e9b3e8feab7c46 (diff)
downloadu-boot-imx-99a4ffe202d8bc1d3c4faff9b8258b686ef656ca.zip
u-boot-imx-99a4ffe202d8bc1d3c4faff9b8258b686ef656ca.tar.gz
u-boot-imx-99a4ffe202d8bc1d3c4faff9b8258b686ef656ca.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
-rwxr-xr-xMAKEALL19
-rw-r--r--include/configs/omap3_beagle.h5
2 files changed, 15 insertions, 9 deletions
diff --git a/MAKEALL b/MAKEALL
index 32d95db..a077285 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -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 \
"
#########################################################################
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 9057606..0f9344b 100644
--- 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 */