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
/
blackvme.h
diff --git
a/include/configs/blackvme.h
b/include/configs/blackvme.h
index
f2dc6aa
..
6e5774c
100644
(file)
--- a/
include/configs/blackvme.h
+++ b/
include/configs/blackvme.h
@@
-177,6
+177,7
@@
#define CONFIG_BAUDRATE 57600
#define CONFIG_LOADS_ECHO 1
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 57600
#define CONFIG_LOADS_ECHO 1
#define CONFIG_UART_CONSOLE 0
+#define CONFIG_BFIN_SERIAL
/*
* U-Boot environment variables. Use "printenv" to examine.
/*
* U-Boot environment variables. Use "printenv" to examine.
@@
-184,10
+185,10
@@
*/
#define CONFIG_BOOTARGS \
"root=/dev/mtdblock0 rw " \
*/
#define CONFIG_BOOTARGS \
"root=/dev/mtdblock0 rw " \
- "clkin_hz="
MK_STR
(CONFIG_CLKIN_HZ) " " \
+ "clkin_hz="
__stringify
(CONFIG_CLKIN_HZ) " " \
"earlyprintk=serial,uart0," \
"earlyprintk=serial,uart0," \
-
MK_STR
(CONFIG_BAUDRATE) " " \
- "console=ttyBF0,"
MK_STR
(CONFIG_BAUDRATE) " "
+
__stringify
(CONFIG_BAUDRATE) " " \
+ "console=ttyBF0,"
__stringify
(CONFIG_BAUDRATE) " "
/* Convenience env variables & commands.
* Reserve kernstart = 0x20000 = 128 kB for U-Boot.
/* Convenience env variables & commands.
* Reserve kernstart = 0x20000 = 128 kB for U-Boot.
@@
-224,7
+225,7
@@
* Soft I2C settings (BF561 does not have hard I2C)
* PF12,13 on SPI connector 0.
*/
* Soft I2C settings (BF561 does not have hard I2C)
* PF12,13 on SPI connector 0.
*/
-#ifdef CONFIG_S
OFT_I2C
+#ifdef CONFIG_S
YS_I2C_SOFT
# define CONFIG_CMD_I2C
# define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF12
# define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF13
# define CONFIG_CMD_I2C
# define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF12
# define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF13