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
/
blackstamp.h
diff --git
a/include/configs/blackstamp.h
b/include/configs/blackstamp.h
index
7d82275
..
7de4253
100644
(file)
--- a/
include/configs/blackstamp.h
+++ b/
include/configs/blackstamp.h
@@
-195,6
+195,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
/*
* I2C settings
/*
* I2C settings
@@
-206,8
+207,8
@@
#ifdef CONFIG_SYS_I2C_SOFT
#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
#ifdef CONFIG_SYS_I2C_SOFT
#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
-#define CONFIG_SYS_
SOFT_I2C
_SPEED 50000
-#define CONFIG_SYS_
SOFT_I2C
_SLAVE 0xFE
+#define CONFIG_SYS_
I2C_SOFT
_SPEED 50000
+#define CONFIG_SYS_
I2C_SOFT
_SLAVE 0xFE
#endif
/*
#endif
/*