diff options
-rw-r--r-- | plat/hisilicon/hikey/hikey_bl1_setup.c | 8 | ||||
-rw-r--r-- | plat/hisilicon/hikey/hikey_bl2_setup.c | 8 | ||||
-rw-r--r-- | plat/hisilicon/poplar/bl1_plat_setup.c | 11 | ||||
-rw-r--r-- | plat/hisilicon/poplar/bl2_plat_setup.c | 11 |
4 files changed, 21 insertions, 17 deletions
diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index 86e4fd6376..01c48ec58a 100644 --- a/plat/hisilicon/hikey/hikey_bl1_setup.c +++ b/plat/hisilicon/hikey/hikey_bl1_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -27,6 +27,7 @@ /* Data structure which holds the extents of the trusted RAM for BL1 */ static meminfo_t bl1_tzram_layout; static console_t console; +static struct mmc_device_info mmc_info; enum { BOOT_NORMAL = 0, @@ -78,7 +79,6 @@ void bl1_plat_arch_setup(void) void bl1_platform_setup(void) { dw_mmc_params_t params; - struct mmc_device_info info; assert((HIKEY_BL1_MMC_DESC_BASE >= SRAM_BASE) && ((SRAM_BASE + SRAM_SIZE) >= @@ -99,8 +99,8 @@ void bl1_platform_setup(void) params.clk_rate = 24 * 1000 * 1000; params.bus_width = MMC_BUS_WIDTH_8; params.flags = MMC_FLAG_CMD23; - info.mmc_dev_type = MMC_IS_EMMC; - dw_mmc_init(¶ms, &info); + mmc_info.mmc_dev_type = MMC_IS_EMMC; + dw_mmc_init(¶ms, &mmc_info); hikey_io_setup(); } diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index feb7f8a46e..a90f12c704 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -33,6 +33,7 @@ static meminfo_t bl2_el3_tzram_layout; static console_t console; +static struct mmc_device_info mmc_info; enum { BOOT_MODE_RECOVERY = 0, @@ -290,7 +291,6 @@ void bl2_el3_plat_arch_setup(void) void bl2_platform_setup(void) { dw_mmc_params_t params; - struct mmc_device_info info; hikey_sp804_init(); hikey_gpio_init(); @@ -322,8 +322,8 @@ void bl2_platform_setup(void) params.clk_rate = 24 * 1000 * 1000; params.bus_width = MMC_BUS_WIDTH_8; params.flags = MMC_FLAG_CMD23; - info.mmc_dev_type = MMC_IS_EMMC; - dw_mmc_init(¶ms, &info); + mmc_info.mmc_dev_type = MMC_IS_EMMC; + dw_mmc_init(¶ms, &mmc_info); hikey_io_setup(); } diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c index 047ba62919..acc1f0e50d 100644 --- a/plat/hisilicon/poplar/bl1_plat_setup.c +++ b/plat/hisilicon/poplar/bl1_plat_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -30,6 +30,10 @@ static meminfo_t bl1_tzram_layout; static meminfo_t bl2_tzram_layout; static console_t console; +#if !POPLAR_RECOVERY +static struct mmc_device_info mmc_info; +#endif + /* * Cannot use default weak implementation in bl1_main.c because BL1 RW data is * not at the top of the secure memory. @@ -90,7 +94,6 @@ void bl1_platform_setup(void) { int i; #if !POPLAR_RECOVERY - struct mmc_device_info info; dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE); #endif @@ -103,8 +106,8 @@ void bl1_platform_setup(void) #if !POPLAR_RECOVERY /* SoC-specific emmc register are initialized/configured by bootrom */ INFO("BL1: initializing emmc\n"); - info.mmc_dev_type = MMC_IS_EMMC; - dw_mmc_init(¶ms, &info); + mmc_info.mmc_dev_type = MMC_IS_EMMC; + dw_mmc_init(¶ms, &mmc_info); #endif plat_io_setup(); diff --git a/plat/hisilicon/poplar/bl2_plat_setup.c b/plat/hisilicon/poplar/bl2_plat_setup.c index 482935c4a7..ee467728e1 100644 --- a/plat/hisilicon/poplar/bl2_plat_setup.c +++ b/plat/hisilicon/poplar/bl2_plat_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -26,6 +26,9 @@ static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE); static console_t console; +#if !POPLAR_RECOVERY +static struct mmc_device_info mmc_info; +#endif /******************************************************************************* * Transfer SCP_BL2 from Trusted RAM using the SCP Download protocol. @@ -171,8 +174,6 @@ void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, { struct meminfo *mem_layout = (struct meminfo *)arg1; #if !POPLAR_RECOVERY - struct mmc_device_info info; - dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE); #endif @@ -187,8 +188,8 @@ void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, #if !POPLAR_RECOVERY /* SoC-specific emmc register are initialized/configured by bootrom */ INFO("BL2: initializing emmc\n"); - info.mmc_dev_type = MMC_IS_EMMC; - dw_mmc_init(¶ms, &info); + mmc_info.mmc_dev_type = MMC_IS_EMMC; + dw_mmc_init(¶ms, &mmc_info); #endif plat_io_setup(); |