diff options
| -rw-r--r-- | drivers/mmc/mmc.c | 4 | ||||
| -rw-r--r-- | plat/hisilicon/poplar/bl1_plat_setup.c | 2 | ||||
| -rw-r--r-- | plat/hisilicon/poplar/bl2_plat_setup.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 73287aef..3e722e3b 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -427,7 +427,7 @@ static int mmc_enumerate(unsigned int clk, unsigned int bus_width) } /* CMD2: Card Identification */ - ret = mmc_send_cmd(MMC_CMD(2), 0, MMC_RESPONSE_R(2), NULL); + ret = mmc_send_cmd(MMC_CMD(2), 0, MMC_RESPONSE_R2, NULL); if (ret != 0) { return ret; } @@ -452,7 +452,7 @@ static int mmc_enumerate(unsigned int clk, unsigned int bus_width) /* CMD9: CSD Register */ ret = mmc_send_cmd(MMC_CMD(9), rca << RCA_SHIFT_OFFSET, - MMC_RESPONSE_R(2), &resp_data[0]); + MMC_RESPONSE_R2, &resp_data[0]); if (ret != 0) { return ret; } diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c index 6fc4f332..f40bcf31 100644 --- a/plat/hisilicon/poplar/bl1_plat_setup.c +++ b/plat/hisilicon/poplar/bl1_plat_setup.c @@ -92,8 +92,8 @@ void bl1_plat_arch_setup(void) void bl1_platform_setup(void) { int i; - struct mmc_device_info info; #if !POPLAR_RECOVERY + struct mmc_device_info info; dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE); #endif diff --git a/plat/hisilicon/poplar/bl2_plat_setup.c b/plat/hisilicon/poplar/bl2_plat_setup.c index 041ed4ad..94d59ffb 100644 --- a/plat/hisilicon/poplar/bl2_plat_setup.c +++ b/plat/hisilicon/poplar/bl2_plat_setup.c @@ -333,9 +333,9 @@ void bl2_plat_get_bl33_meminfo(meminfo_t *bl33_meminfo) void bl2_early_platform_setup(meminfo_t *mem_layout) { +#if !POPLAR_RECOVERY struct mmc_device_info info; -#if !POPLAR_RECOVERY dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE); #endif |