diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
| commit | e5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch) | |
| tree | 391225b279509f4403eb6d5e973f0b25e789a8af /include/configs/m28evk.h | |
| parent | 7cb70a34b976e68f6348ea0718780e8f38901482 (diff) | |
| parent | 81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff) | |
| download | u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.zip u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.gz u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/m28evk.h')
| -rw-r--r-- | include/configs/m28evk.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 6887171..1b51fe2 100644 --- 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 |