aboutsummaryrefslogtreecommitdiff
path: root/plat/hisilicon
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2018-09-27 16:48:00 +0800
committerShawn Guo <shawn.guo@linaro.org>2018-09-27 17:04:46 +0800
commitd5ed2946407c08cc57cd14eec51517fc5fa0cec4 (patch)
tree8956b87549c713406107e0325f012bfe57aeb639 /plat/hisilicon
parent9068257ea7e0242214f9e833410d9b3fc8bcbe45 (diff)
downloadtrusted-firmware-a-d5ed2946407c08cc57cd14eec51517fc5fa0cec4.tar.gz
poplar: fix build error with POPLAR_RECOVERY=1
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 <shawn.guo@linaro.org>
Diffstat (limited to 'plat/hisilicon')
-rw-r--r--plat/hisilicon/poplar/bl1_plat_setup.c2
-rw-r--r--plat/hisilicon/poplar/bl2_plat_setup.c2
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 6fc4f3328c..f40bcf319f 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 041ed4ad5e..94d59ffb86 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