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>

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>
Nishanth Menon · Tom Rini
1 parent d71dd0428c
Showing 1 changed file with 12 additions and 10 deletions Side-by-side Diff
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; " \
...	...	@@ -104,7 +104,13 @@
104	104
105	105	#define CONFIG_CMD_EXT2 /* EXT2 Support */
106	106	#define CONFIG_CMD_FAT /* FAT support */
107		-#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
	107	+#define CONFIG_CMD_FS_GENERIC /* Generic FS support */
	108	+#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
	109	+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
	110	+#define MTDIDS_DEFAULT "nand0=nand"
	111	+#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
	112	+ "1920k(u-boot),128k(u-boot-env),"\
	113	+ "4m(kernel),-(fs)"
108	114
109	115	#define CONFIG_CMD_I2C /* I2C serial bus support */
110	116	#define CONFIG_CMD_MMC /* MMC support */
111	117
...	...	@@ -143,19 +149,15 @@
143	149	/* CS0 */
144	150	#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
145	151	/* devices */
146		-#define CONFIG_JFFS2_NAND
147		-/* nand device jffs2 lives on */
148		-#define CONFIG_JFFS2_DEV "nand0"
149		-/* start of jffs2 partition */
150		-#define CONFIG_JFFS2_PART_OFFSET 0x680000
151		-#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */
152		- /* partition */
153	152
154	153	/* Environment information */
155	154	#define CONFIG_BOOTDELAY 10
156	155
157	156	#define CONFIG_EXTRA_ENV_SETTINGS \
158	157	"loadaddr=0x82000000\0" \
	158	+ "bootfile=uImage\0" \
	159	+ "bootdir=/\0" \
	160	+ "bootpart=0:1\0" \
159	161	"usbtty=cdc_acm\0" \
160	162	"console=ttyS2,115200n8\0" \
161	163	"mmcdev=0\0" \
...	...	@@ -172,7 +174,7 @@
172	174	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
173	175	"bootscript=echo Running bootscript from mmc ...; " \
174	176	"source ${loadaddr}\0" \
175		- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \" \
	177	+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \" \
176	178	"mmcboot=echo Booting from mmc ...; " \
177	179	"run mmcargs; " \
178	180	"bootm ${loadaddr}\0" \
...	...	@@ -186,7 +188,7 @@
186	188	"if run loadbootscript; then " \
187	189	"run bootscript; " \
188	190	"else " \
189		- "if run loaduimage; then " \
	191	+ "if run loadimage; then " \
190	192	"run mmcboot; " \
191	193	"else run nandboot; " \
192	194	"fi; " \