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://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
include
/
configs
/
cm-bf548.h
diff --git
a/include/configs/cm-bf548.h
b/include/configs/cm-bf548.h
index fa62a8e9c1da26bec526e475af39cd853e8f2e0d..72eafc5699b57f5dc578fad441a733f4a66b21e5 100644
(file)
--- a/
include/configs/cm-bf548.h
+++ b/
include/configs/cm-bf548.h
@@
-72,7
+72,6
@@
* Network Settings
*/
#define ADI_CMDS_NETWORK 1
* Network Settings
*/
#define ADI_CMDS_NETWORK 1
-#define CONFIG_NET_MULTI
#define CONFIG_SMC911X 1
#define CONFIG_SMC911X_BASE 0x24000000
#define CONFIG_SMC911X_16_BIT
#define CONFIG_SMC911X 1
#define CONFIG_SMC911X_BASE 0x24000000
#define CONFIG_SMC911X_16_BIT
@@
-105,8
+104,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
/*
/*
@@
-119,10
+118,13
@@
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
+#define CONFIG_ADI_GPIO2
+
#ifndef __ADSPBF542__
/* Don't waste time transferring a logo over the UART */
# if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
# define CONFIG_VIDEO
#ifndef __ADSPBF542__
/* Don't waste time transferring a logo over the UART */
# if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
# define CONFIG_VIDEO
+# define EASYLOGO_HEADER <asm/bfin_logo_230x230_gzip.h>
# endif
# define CONFIG_DEB_DMA_URGENT
#endif
# endif
# define CONFIG_DEB_DMA_URGENT
#endif