summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-06-24 09:05:35 -0400
committerTom Rini <trini@konsulko.com>2020-06-24 09:05:35 -0400
commit922c6d5d0090e51fdd5bb75795c3384a18f5d2b6 (patch)
tree434b45e0a8a458884dbb0119da404808a2f4f488 /cmd
parent331c7438104149655a5fe96ed4a3d29b00d422de (diff)
parentf12341a9529540113f01989149bbbeb68662a829 (diff)
Merge tag 'mmc-2020-6-24' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- Fix fsl_esdhc_imx tunning mask - Disable CMD CRC for normal tuning for fsl_esdhc_imx - Retry CM1 until emmc ready - Fix sdhci HISPD handling - Cache-aligned extcsd reading
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mmc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 1c252e05028..1529a3e05dd 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
#include <blk.h>
#include <command.h>
#include <console.h>
+#include <memalign.h>
#include <mmc.h>
#include <part.h>
#include <sparse_format.h>
@@ -56,7 +57,8 @@ static void print_mmcinfo(struct mmc *mmc)
if (!IS_SD(mmc) && mmc->version >= MMC_VERSION_4_41) {
bool has_enh = (mmc->part_support & ENHNCD_SUPPORT) != 0;
bool usr_enh = has_enh && (mmc->part_attr & EXT_CSD_ENH_USR);
- u8 wp, ext_csd[MMC_MAX_BLOCK_LEN];
+ ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
+ u8 wp;
int ret;
#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)