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 git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
blackstamp.h
diff --git
a/include/configs/blackstamp.h
b/include/configs/blackstamp.h
index
83ad659
..
7de4253
100644
(file)
--- a/
include/configs/blackstamp.h
+++ b/
include/configs/blackstamp.h
@@
-40,7
+40,6
@@
#define SHARED_RESOURCES 1
/* Is I2C bit-banged? */
#define SHARED_RESOURCES 1
/* Is I2C bit-banged? */
-#undef CONFIG_SOFT_I2
/*
* Clock Settings
/*
* Clock Settings
@@
-115,7
+114,7
@@
# undef CONFIG_CMD_NET
#endif
# undef CONFIG_CMD_NET
#endif
-#ifdef CONFIG_S
OFT_I2C
+#ifdef CONFIG_S
YS_I2C_SOFT
# define CONFIG_CMD_I2C
#endif
# define CONFIG_CMD_I2C
#endif
@@
-196,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
@@
-204,11
+204,11
@@
* Note these pins are arbitrarily chosen because we aren't using
* them yet. You can (and probably should) change these values!
*/
* Note these pins are arbitrarily chosen because we aren't using
* them yet. You can (and probably should) change these values!
*/
-#ifdef CONFIG_S
OFT_I2C
+#ifdef CONFIG_S
YS_I2C_SOFT
#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
-#define CONFIG_SYS_I2C_S
PEED
50000
-#define CONFIG_SYS_I2C_S
LAVE
0xFE
+#define CONFIG_SYS_I2C_S
OFT_SPEED
50000
+#define CONFIG_SYS_I2C_S
OFT_SLAVE
0xFE
#endif
/*
#endif
/*