diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-19 23:01:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-19 23:01:05 -0500 |
| commit | 7b1cfec31764cd9247ee3cdaf5b7caa804741344 (patch) | |
| tree | 9048f21b1186b4e7201e9acfd611883e288dec08 /include | |
| parent | d884c58f0c7b997fd7f04e360d86717e75de74b1 (diff) | |
| parent | 4a41fec589b5f57bc83fca423222c6a1860a50f5 (diff) | |
| download | u-boot-7b1cfec31764cd9247ee3cdaf5b7caa804741344.zip u-boot-7b1cfec31764cd9247ee3cdaf5b7caa804741344.tar.gz u-boot-7b1cfec31764cd9247ee3cdaf5b7caa804741344.tar.bz2 | |
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am57xx_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 2 | ||||
| -rw-r--r-- | include/mmc.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 7546b3f..65465d1 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -15,9 +15,7 @@ #include <environment/ti/dfu.h> #include <linux/sizes.h> -#ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION -#endif #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ff90b6d..975e6fd 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -14,9 +14,7 @@ #include <environment/ti/dfu.h> -#ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION -#endif #define CONFIG_VERY_BIG_RAM #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/mmc.h b/include/mmc.h index a46eaed..86f885b 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -54,6 +54,7 @@ #define MMC_VERSION_4_1 MAKE_MMC_VERSION(4, 1, 0) #define MMC_VERSION_4_2 MAKE_MMC_VERSION(4, 2, 0) #define MMC_VERSION_4_3 MAKE_MMC_VERSION(4, 3, 0) +#define MMC_VERSION_4_4 MAKE_MMC_VERSION(4, 4, 0) #define MMC_VERSION_4_41 MAKE_MMC_VERSION(4, 4, 1) #define MMC_VERSION_4_5 MAKE_MMC_VERSION(4, 5, 0) #define MMC_VERSION_5_0 MAKE_MMC_VERSION(5, 0, 0) |