diff options
| author | Tom Rini <[email protected]> | 2017-05-15 20:17:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-05-16 08:10:50 -0400 |
| commit | 4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch) | |
| tree | 291b37802625be36bced91db4f86b158e41c2e13 /include | |
| parent | d09ec7f81650425140776995fc9752189ddf7956 (diff) | |
| parent | b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
match other TI platforms in the same situation.
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/am335x_shc.h | 1 | ||||
| -rw-r--r-- | include/configs/chiliboard.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_logic.h | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 51c3d493c86..b6b14d38bdd 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -291,6 +291,8 @@ * DM support in SPL */ #ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_MMC +#undef CONFIG_DM_MMC_OPS #undef CONFIG_TIMER #undef CONFIG_DM_USB #endif diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index bc0943fdfd0..247679eee37 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -262,6 +262,7 @@ */ #ifdef CONFIG_SPL_BUILD #undef CONFIG_DM_MMC +#undef CONFIG_DM_MMC_OPS #undef CONFIG_TIMER #endif diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index f515db038d1..20168b22b63 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -188,6 +188,7 @@ */ #ifdef CONFIG_SPL_BUILD #undef CONFIG_DM_MMC +#undef CONFIG_DM_MMC_OPS #undef CONFIG_TIMER #undef CONFIG_DM_USB #endif diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 735c9ef08ab..f8978037f2b 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -23,6 +23,7 @@ * DM support in SPL */ #undef CONFIG_DM_MMC +#undef CONFIG_DM_MMC_OPS #undef OMAP_HSMMC_USE_GPIO /* select serial console configuration for SPL */ |