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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
cm-bf527.h
diff --git
a/include/configs/cm-bf527.h
b/include/configs/cm-bf527.h
index
ad1dd12
..
643c837
100644
(file)
--- a/
include/configs/cm-bf527.h
+++ b/
include/configs/cm-bf527.h
@@
-68,7
+68,6
@@
#define CONFIG_BFIN_NFC_CTL_VAL 0x0033
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_BFIN_NFC_CTL_VAL 0x0033
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define NAND_MAX_CHIPS 1
#define CONFIG_CMD_NAND
#endif
#define CONFIG_CMD_NAND
#endif
@@
-82,12
+81,11
@@
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define CONFIG_NETCONSOLE 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define CONFIG_NETCONSOLE 1
-#define CONFIG_NET_MULTI 1
#endif
#define CONFIG_HOSTNAME cm-bf527
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
#endif
#define CONFIG_HOSTNAME cm-bf527
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
-
+#define CONFIG_LIB_RAND
/*
* Flash Settings
/*
* Flash Settings
@@
-115,10
+113,8
@@
/*
* I2C Settings
*/
/*
* I2C Settings
*/
-#define CONFIG_BFIN_TWI_I2C 1
-#define CONFIG_HARD_I2C 1
-#define CONFIG_SYS_I2C_SPEED 50000
-#define CONFIG_SYS_I2C_SLAVE 0
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
/*
/*
@@
-133,7
+129,6
@@
"flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
"flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
-
/*
* Pull in common ADI header for remaining command/environment setup
*/
/*
* Pull in common ADI header for remaining command/environment setup
*/