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 'series1_v2' of git://git.denx.de/u-boot-sparc
[oweals/u-boot.git]
/
include
/
configs
/
ti_omap5_common.h
diff --git
a/include/configs/ti_omap5_common.h
b/include/configs/ti_omap5_common.h
index 189ea7e9140e33465b98f2e8b62b0db262801f37..5acbc92c3f60923c18348191dfec99992bebf94e 100644
(file)
--- a/
include/configs/ti_omap5_common.h
+++ b/
include/configs/ti_omap5_common.h
@@
-51,9
+51,13
@@
* Hardware drivers
*/
#define CONFIG_SYS_NS16550
* Hardware drivers
*/
#define CONFIG_SYS_NS16550
+#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 48000000
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 48000000
+#else
+#define CONFIG_OMAP_SERIAL
+#endif
/*
* Environment setup
/*
* Environment setup
@@
-157,4
+161,12
@@
#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */
#endif
#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */
#endif
+/*
+ * Disable MMC DM for SPL build and can be re-enabled after adding
+ * DM support in SPL
+ */
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_DM_MMC
+#endif
+
#endif /* __CONFIG_TI_OMAP5_COMMON_H */
#endif /* __CONFIG_TI_OMAP5_COMMON_H */