projects
/
oweals
/
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-fsl-qoriq
[oweals/u-boot.git]
/
include
/
configs
/
bf537-srv1.h
diff --git
a/include/configs/bf537-srv1.h
b/include/configs/bf537-srv1.h
index 7e9dd36bce25ab37db1d82c57938524d539e8873..d01d88f3b47cc673af67f5dd079fe8cad2ff76e1 100644
(file)
--- a/
include/configs/bf537-srv1.h
+++ b/
include/configs/bf537-srv1.h
@@
-75,7
+75,6
@@
#ifndef __ADSPBF534__
#define CONFIG_BFIN_MAC
#define CONFIG_NETCONSOLE 1
#ifndef __ADSPBF534__
#define CONFIG_BFIN_MAC
#define CONFIG_NETCONSOLE 1
-#define CONFIG_NET_MULTI 1
#endif
#ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15
#endif
#ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15
@@
-86,10
+85,10
@@
#endif
#define CONFIG_SYS_AUTOLOAD "no"
#endif
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH
/romfs
+#define CONFIG_ROOTPATH
"/romfs"
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
-
+#define CONFIG_LIB_RAND
/*
* Flash Settings
/*
* Flash Settings
@@
-121,8
+120,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
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
@@
-137,6
+136,7
@@
#define CONFIG_BAUDRATE 115200
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 115200
#define CONFIG_UART_CONSOLE 0
+#define CONFIG_BFIN_SERIAL
#define CONFIG_PANIC_HANG 1
#define CONFIG_RTC_BFIN 1
#define CONFIG_PANIC_HANG 1
#define CONFIG_RTC_BFIN 1
@@
-156,6
+156,7
@@
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
#endif
#define CONFIG_CMD_BOOTLDR
#endif
#define CONFIG_CMD_BOOTLDR
@@
-173,7
+174,7
@@
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
- "sf probe "
MK_STR
(BFIN_BOOT_SPI_SSEL) ";" \
+ "sf probe "
__stringify
(BFIN_BOOT_SPI_SSEL) ";" \
"sf erase 0 0x30000;" \
"sf write $(loadaddr) 0 $(filesize)" \
"flashboot=sf read 0x1000000 0x30000 0x320000;" \
"sf erase 0 0x30000;" \
"sf write $(loadaddr) 0 $(filesize)" \
"flashboot=sf read 0x1000000 0x30000 0x320000;" \