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://git.denx.de/u-boot-video
[platform/kernel/u-boot.git]
/
include
/
configs
/
omap4_common.h
diff --git
a/include/configs/omap4_common.h
b/include/configs/omap4_common.h
index
d8ac8c0
..
228eac5
100644
(file)
--- a/
include/configs/omap4_common.h
+++ b/
include/configs/omap4_common.h
@@
-98,7
+98,9
@@
#define CONFIG_I2C_MULTI_BUS 1
/* TWL6030 */
+#ifndef CONFIG_SPL_BUILD
#define CONFIG_TWL6030_POWER 1
+#endif
/* MMC */
#define CONFIG_GENERIC_MMC 1