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 688717158b53cc0d209a994dfb80c2875a14973a..1b51fe2dc51cf9b3d1d23612b35315dd470cb365 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -191,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
@@ -274,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