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

[u-boot] / include / configs / m28evk.h

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index b49ec8c7dd61fd4139a145bb62f2f730b23c025f..1b51fe2dc51cf9b3d1d23612b35315dd470cb365 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -178,6 +178,8 @@
                "512k(environment),"            \
                "512k(redundant-environment),"  \
                "4m(kernel),"                   \
+               "128k(fdt),"                    \
+               "8m(ramdisk),"                  \
                "-(filesystem)"
 #else
 #define        CONFIG_ENV_IS_NOWHERE
@@ -189,7 +191,6 @@
 #ifdef CONFIG_CMD_NET
 #define        CONFIG_ETHPRIME                 "FEC0"
 #define        CONFIG_FEC_MXC
-#define        CONFIG_FEC_MXC_MULTI
 #define        CONFIG_MII
 #define        CONFIG_FEC_XCV_TYPE             RMII
 #endif
@@ -272,7 +273,7 @@
 #define        CONFIG_SETUP_MEMORY_TAGS
 #define        CONFIG_BOOTDELAY        3
 #define        CONFIG_BOOTFILE         "uImage"
-#define        CONFIG_BOOTARGS         "console=ttyAM0,115200n8 "
+#define        CONFIG_BOOTARGS         "console=ttyAMA0,115200n8 "
 #define        CONFIG_BOOTCOMMAND      "run bootcmd_net"
 #define        CONFIG_LOADADDR         0x42000000
 #define        CONFIG_SYS_LOAD_ADDR    CONFIG_LOADADDR
@@ -297,7 +298,7 @@
                "if tftp ${update_nand_full_filename} ; then "          \
                "run update_nand_get_fcb_size ; "                       \
                "nand scrub -y 0x0 ${filesize} ; "                      \
-               "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; "  \
+               "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "   \
                "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
                "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
                "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \