projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
configs
/
mecp5123.h
diff --git
a/include/configs/mecp5123.h
b/include/configs/mecp5123.h
index
b9cf1dc
..
cafc273
100644
(file)
--- a/
include/configs/mecp5123.h
+++ b/
include/configs/mecp5123.h
@@
-178,9
+178,7
@@
#define CONFIG_CMD_NAND
#define CONFIG_NAND_MPC5121_NFC
#define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_CMD_NAND
#define CONFIG_NAND_MPC5121_NFC
#define CONFIG_SYS_NAND_BASE 0x40000000
-
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
/*
* Configuration parameters for MPC5121 NAND driver
/*
* Configuration parameters for MPC5121 NAND driver
@@
-224,6
+222,7
@@
* Serial console configuration
*/
#define CONFIG_PSC_CONSOLE 3 /* console is on PSC3 */
* Serial console configuration
*/
#define CONFIG_PSC_CONSOLE 3 /* console is on PSC3 */
+#define CONFIG_SYS_PSC3
#if CONFIG_PSC_CONSOLE != 3
#error CONFIG_PSC_CONSOLE must be 3
#endif
#if CONFIG_PSC_CONSOLE != 3
#error CONFIG_PSC_CONSOLE must be 3
#endif
@@
-240,7
+239,6
@@
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
#ifdef CONFIG_SYS_HUSH_PARSER
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#endif
/* I2C */
#endif
/* I2C */
@@
-268,7
+266,6
@@
* Ethernet configuration
*/
#define CONFIG_MPC512x_FEC 1
* Ethernet configuration
*/
#define CONFIG_MPC512x_FEC 1
-#define CONFIG_NET_MULTI
#define CONFIG_PHY_ADDR 0x1
#define CONFIG_MII 1 /* MII PHY management */
#define CONFIG_FEC_AN_TIMEOUT 1
#define CONFIG_PHY_ADDR 0x1
#define CONFIG_MII 1 /* MII PHY management */
#define CONFIG_FEC_AN_TIMEOUT 1
@@
-373,8
+370,8
@@
#define CONFIG_TIMESTAMP
#define CONFIG_HOSTNAME mecp512x
#define CONFIG_TIMESTAMP
#define CONFIG_HOSTNAME mecp512x
-#define CONFIG_BOOTFILE
/tftpboot/mecp512x/uImage
-#define CONFIG_ROOTPATH
/tftpboot/mecp512x/target_root
+#define CONFIG_BOOTFILE
"/tftpboot/mecp512x/uImage"
+#define CONFIG_ROOTPATH
"/tftpboot/mecp512x/target_root"
#define CONFIG_LOADADDR 400000 /* def. location for tftp and bootm */
#define CONFIG_LOADADDR 400000 /* def. location for tftp and bootm */