diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-26 12:29:30 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-26 12:29:30 (GMT) |
| commit | c3c9fd31bad80ead1682de917e27fa6073eae02b (patch) | |
| tree | 4cb097f843fb0ab60160035c67799a753fc7c13e /include | |
| parent | c482c60a14e5fa44a62e13bab4d07c52c37915dc (diff) | |
| parent | 6e677caf8cf0cc1a2310f2e4e9f27b81c674bc95 (diff) | |
| download | u-boot-c3c9fd31bad80ead1682de917e27fa6073eae02b.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ba7cf15..9f947ee 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -108,9 +108,25 @@ /* Timer information. */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ +/* + * Disable DM_* for SPL build and can be re-enabled after adding + * DM support in SPL + */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_I2C +#endif + /* I2C IP block */ #define CONFIG_I2C +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#else +/* + * Enable CONFIG_DM_I2C_COMPAT temporarily until all the i2c client + * devices are adopted to DM + */ +#define CONFIG_DM_I2C_COMPAT +#endif /* MMC/SD IP block */ #define CONFIG_MMC |