summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-04-08 09:50:55 -0500
committerTom Rini <trini@ti.com>2014-04-17 17:24:39 -0400
commit4e8183b7d4afc4795712fc54a8aee07ab5108b26 (patch)
tree99b805cd8a3cebd374b00b5106b8ef47e48f0958
parentd71dd0428c3b58be8de93b37f54fbf9c26b92eca (diff)
downloadu-boot-imx-4e8183b7d4afc4795712fc54a8aee07ab5108b26.zip
u-boot-imx-4e8183b7d4afc4795712fc54a8aee07ab5108b26.tar.gz
u-boot-imx-4e8183b7d4afc4795712fc54a8aee07ab5108b26.tar.bz2
omap3: zoom1: disable JFFS2 and enable FS_GENERIC
This is more in line with commits 664979a2a9f764b63b8094458b87247d254b0cc1(omap3_beagle: remove JFFS2 support.) and 102ce9ea7afdda80fe25aa786975e1722196bdb9 (omap3_beagle: enable CMD_FS_GENERIC and simplify load of image/ramdisk) CMD_FS_GENERIC allows us to simplify where we load up our image from either from ext2/fat etc. So, lets use that instead of cumbersome options we'd have to use. Sticking with existing conventions, defaults will be: bootfile=uImage bootpart=0:1 (first partition) bootdir=/ (/ in first partition) Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--include/configs/omap3_zoom1.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 4fb3628..110e3db 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -104,7 +104,13 @@
#define CONFIG_CMD_EXT2 /* EXT2 Support */
#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
+#define CONFIG_CMD_FS_GENERIC /* Generic FS support */
+#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
+#define CONFIG_MTD_DEVICE /* needed for mtdparts 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 */
@@ -143,19 +149,15 @@
/* CS0 */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */
-#define CONFIG_JFFS2_NAND
-/* nand device jffs2 lives on */
-#define CONFIG_JFFS2_DEV "nand0"
-/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_OFFSET 0x680000
-#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */
- /* partition */
/* Environment information */
#define CONFIG_BOOTDELAY 10
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
+ "bootfile=uImage\0" \
+ "bootdir=/\0" \
+ "bootpart=0:1\0" \
"usbtty=cdc_acm\0" \
"console=ttyS2,115200n8\0" \
"mmcdev=0\0" \
@@ -172,7 +174,7 @@
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source ${loadaddr}\0" \
- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"bootm ${loadaddr}\0" \
@@ -186,7 +188,7 @@
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
- "if run loaduimage; then " \
+ "if run loadimage; then " \
"run mmcboot; " \
"else run nandboot; " \
"fi; " \