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 'master' of git://git.denx.de/u-boot-microblaze
[platform/kernel/u-boot.git]
/
include
/
configs
/
TQM5200.h
diff --git
a/include/configs/TQM5200.h
b/include/configs/TQM5200.h
index
db7f51d
..
a4336a7
100644
(file)
--- a/
include/configs/TQM5200.h
+++ b/
include/configs/TQM5200.h
@@
-253,7
+253,7
@@
#define CUSTOM_ENV_SETTINGS \
"bootfile=cam5200/uImage\0" \
"u-boot=cam5200/u-boot.bin\0" \
#define CUSTOM_ENV_SETTINGS \
"bootfile=cam5200/uImage\0" \
"u-boot=cam5200/u-boot.bin\0" \
- "setup=tftp 200000 cam5200/setup.img;
autoscr
200000\0"
+ "setup=tftp 200000 cam5200/setup.img;
source
200000\0"
#endif
#if defined(CONFIG_TQM5200_B)
#endif
#if defined(CONFIG_TQM5200_B)
@@
-407,7
+407,9
@@
#endif
/* Dynamic MTD partition support */
#endif
/* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM5200-0"
#ifdef CONFIG_STK52XX
#define MTDIDS_DEFAULT "nor0=TQM5200-0"
#ifdef CONFIG_STK52XX
@@
-507,10
+509,11
@@
* Ethernet configuration
*/
#define CONFIG_MPC5xxx_FEC 1
* Ethernet configuration
*/
#define CONFIG_MPC5xxx_FEC 1
+#define CONFIG_MPC5xxx_FEC_MII100
/*
/*
- * Define CONFIG_
FEC_10MBIT
to force FEC at 10Mb
+ * Define CONFIG_
MPC5xxx_FEC_MII10
to force FEC at 10Mb
*/
*/
-/* #define CONFIG_
FEC_10MBIT 1
*/
+/* #define CONFIG_
MPC5xxx_FEC_MII10
*/
#define CONFIG_PHY_ADDR 0x00
/*
#define CONFIG_PHY_ADDR 0x00
/*