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
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-pnav.h
diff --git
a/include/configs/bf537-pnav.h
b/include/configs/bf537-pnav.h
index
39bbb41
..
4f2b2cb
100644
(file)
--- a/
include/configs/bf537-pnav.h
+++ b/
include/configs/bf537-pnav.h
@@
-52,7
+52,7
@@
#define CONFIG_EBIU_AMBCTL0_VAL 0x7BB033B0
#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC27BB0
#define CONFIG_EBIU_AMBCTL0_VAL 0x7BB033B0
#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC27BB0
-#define CONFIG_SYS_MONITOR_LEN (
256
* 1024)
+#define CONFIG_SYS_MONITOR_LEN (
512
* 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
@@
-63,12
+63,11
@@
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
-#define CONFIG_NET_MULTI 1
#endif
#define CONFIG_HOSTNAME bf537-pnav
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:24:21:18 */
#endif
#define CONFIG_HOSTNAME bf537-pnav
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:24:21:18 */
-
+#define CONFIG_LIB_RAND
/*
* Flash Settings
/*
* Flash Settings
@@
-112,13
+111,10
@@
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
- arch/blackfin/cpu/traps.o (.text .text.*); \
- arch/blackfin/cpu/interrupt.o (.text .text.*); \
- arch/blackfin/cpu/serial.o (.text .text.*); \
- common/dlmalloc.o (.text .text.*); \
- lib/crc32.o (.text .text.*); \
+ arch/blackfin/lib/built-in.o (.text*); \
+ arch/blackfin/cpu/built-in.o (.text*); \
. = DEFINED(env_offset) ? env_offset : .; \
. = DEFINED(env_offset) ? env_offset : .; \
- common/env_embedded.o
(.text .text.
*);
+ common/env_embedded.o
(.text
*);
#endif
#endif
@@
-146,8
+142,8
@@
/*
* I2C settings
*/
/*
* I2C settings
*/
-#define CONFIG_
BFIN_TWI_I2C 1
-#define CONFIG_
HARD_I2C 1
+#define CONFIG_
SYS_I2C
+#define CONFIG_
SYS_I2C_ADI
/*
/*