diff options
| author | Tom Rini <trini@ti.com> | 2014-01-09 16:05:32 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-09 16:05:32 (GMT) |
| commit | 8401bfa91ef57e331e2a3abdf768d41803bec88e (patch) | |
| tree | 144e43bb5db26b33fcbadbb52d80760af2f70d04 /include | |
| parent | 33d413fc91e0bbbb92962a80f5333d6f1f628c5b (diff) | |
| parent | c5c1af21764d9423b45c1d03e835c4547a8bc5cb (diff) | |
| download | u-boot-8401bfa91ef57e331e2a3abdf768d41803bec88e.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/arndale.h | 1 | ||||
| -rw-r--r-- | include/configs/exynos5250-dt.h | 1 | ||||
| -rw-r--r-- | include/configs/omap5_uevm.h | 1 | ||||
| -rw-r--r-- | include/mmc.h | 4 |
4 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/arndale.h b/include/configs/arndale.h index a3cb56b..3d29caf 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -85,6 +85,7 @@ #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_SUPPORT_EMMC_BOOT +#define CONFIG_BOUNCE_BUFFER #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 8fb904c..b39bafc 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -102,6 +102,7 @@ #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_SUPPORT_EMMC_BOOT +#define CONFIG_BOUNCE_BUFFER #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 2f128b8..76c5106 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -36,6 +36,7 @@ #define CONFIG_EFI_PARTITION #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART +#define CONFIG_HSMMC2_8BIT /* Required support for the TCA642X GPIO we have on the uEVM */ #define CONFIG_TCA642X diff --git a/include/mmc.h b/include/mmc.h index cb558da..e1060b9 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -262,6 +262,8 @@ struct mmc { uint card_caps; uint host_caps; uint ocr; + uint dsr; + uint dsr_imp; uint scr[2]; uint csd[4]; uint cid[4]; @@ -304,7 +306,7 @@ int board_mmc_getcd(struct mmc *mmc); int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); int mmc_getwp(struct mmc *mmc); -void spl_mmc_load(void) __noreturn; +int mmc_set_dsr(struct mmc *mmc, u16 val); /* Function to change the size of boot partition and rpmb partitions */ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, unsigned long rpmbsize); |