  		"ethprime=FEC0\0"					\
  		"uboot=u-boot.bin\0"			\
  		"kernel=uImage\0"				\
-@@ -126,12 +127,17 @@
+@@ -124,15 +125,17 @@
+ 		"bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+ 		"bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
  			"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
- 		"bootcmd_net=run bootargs_base bootargs_nfs; "		\
+-		"bootcmd_net=run bootargs_base bootargs_nfs; "		\
++		"bootcmd_nfs=run bootargs_base bootargs_nfs; "		\
  			"tftpboot ${loadaddr} ${kernel}; bootm\0"	\
 -		"bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
-+		"bootargs_mmc=setenv bootargs ${bootargs} ip=none "     \
- 			"root=/dev/mmcblk0p1 rootwait\0"                \
- 		"bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
- 		"mmc dev 3; "	\
- 		"mmc read ${loadaddr} 0x800 0x2000; bootm\0"	\
+-			"root=/dev/mmcblk0p1 rootwait\0"                \
+-		"bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-		"mmc dev 3; "	\
+-		"mmc read ${loadaddr} 0x800 0x2000; bootm\0"	\
 -		"bootcmd=run bootcmd_net\0"                             \
-+		"bootargs_sd=setenv bootargs ${bootargs} ip=none " \
-+			"root=/dev/mmcblk1p1 rootwait\0" \
-+		"bootcmd_sd=run bootargs_base bootargs_sd; "   \
-+			"mmc dev 2; "	\
-+			"mmc read ${loadaddr} 0x800 0x2000; bootm\0"	\
-+		"bootcmd=run bootcmd_mmc\0"                             \
- 
+-
++		"bootargs_sd=setenv bootargs ${bootargs} ip=none "	\
++			"root=/dev/mmcblk1p2 rootwait consoleblank=0\0"	\
++		"bootcmd_sd=run bootargs_base bootargs_sd; mmc dev 2; " \
++			"fatload mmc 2:1 ${loadaddr} /uimage; bootm\0"	\
++		"bootargs_mmc=setenv bootargs ${bootargs} ip=none "	\
++			"root=/dev/mmcblk0p2 rootwait consoleblank=0\0"	\
++		"bootcmd_mmc=run bootargs_base bootargs_mmc; mmc dev 3; " \
++			"fatload mmc 3:1 ${loadaddr} /uimage; bootm\0"	\
++		"bootcmd=run bootcmd_sd; run bootcmd_mmc\0"
  
  #define CONFIG_ARP_TIMEOUT	200UL
-@@ -140,7 +146,7 @@
+ 
+@@ -140,7 +143,7 @@
   * Miscellaneous configurable options
   */
  #define CONFIG_SYS_LONGHELP		/* undef to save memory */

 		"bootcmd_net=run bootargs_base bootargs_nfs; "		\
 			"tftpboot ${loadaddr} ${kernel}; bootm\0"	\
-		"bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
+		"bootargs_mmc=setenv bootargs ${bootargs} ip=none "     \
 			"root=/dev/mmcblk0p1 rootwait\0"                \
 		"bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
 		"mmc dev 3; "	\
 		"mmc read ${loadaddr} 0x800 0x2000; bootm\0"	\
-		"bootcmd=run bootcmd_net\0"                             \
+		"bootargs_sd=setenv bootargs ${bootargs} ip=none "   \
+			"root=/dev/mmcblk1p1 rootwait\0"    \
+		"bootcmd_sd=run bootargs_base bootargs_sd; "    \
+			"mmc dev 2; "   \
+			"mmc read ${loadaddr} 0x800 0x2000; bootm\0"   \
+		"bootcmd=run bootcmd_mmc\0"                             \
 
 
 #define CONFIG_ARP_TIMEOUT	200UL
@@ -145,7 +153,7 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 /* Print Buffer Size */
@@ -171,8 +174,8 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
