From d5ed2946407c08cc57cd14eec51517fc5fa0cec4 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 27 Sep 2018 16:48:00 +0800 Subject: [PATCH] poplar: fix build error with POPLAR_RECOVERY=1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit eba1b6b3c724 ("plat/poplar: migrate to mmc framework") defines variable 'info' without !POPLAR_RECOVERY protection, and hence causes the following unused variable error with POPLAR_RECOVERY=1 build. plat/hisilicon/poplar/bl1_plat_setup.c: In function ‘bl1_platform_setup’: plat/hisilicon/poplar/bl1_plat_setup.c:95:25: error: unused variable ‘info’ [-Werror=unused-variable] struct mmc_device_info info; ^~~~ The patches fixes the build error with POPLAR_RECOVERY=1. Signed-off-by: Shawn Guo --- plat/hisilicon/poplar/bl1_plat_setup.c | 2 +- plat/hisilicon/poplar/bl2_plat_setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c index 6fc4f3328..f40bcf319 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 041ed4ad5..94d59ffb8 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