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

[oweals/u-boot.git] / include / configs / M54451EVB.h

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 69bb26b8aede2d08682668ab2bb256615d02fa2c..a5acfd28460f53e8bc438c88a4f157956fa95849 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -94,7 +94,7 @@
 #      define MCFFEC_TOUT_LOOP 50000
 
 #      define CONFIG_BOOTDELAY 1       /* autoboot after 5 seconds */
-#      define CONFIG_BOOTARGS          "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
+#      define CONFIG_BOOTARGS          "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)"
 #      define CONFIG_ETHADDR           00:e0:0c:bc:e5:60
 #      define CONFIG_ETHPRIME          "FEC0"
 #      define CONFIG_IPADDR            192.162.1.2
@@ -277,7 +277,6 @@
 #      define CONFIG_ENV_SECT_SIZE     0x8000
 #endif
 #undef CONFIG_ENV_OVERWRITE
-#undef CONFIG_ENV_IS_EMBEDDED
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE