From 0c16e7d2fbb99fb546efd5303ec863742d99500e Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 17 Sep 2020 11:54:52 +0200 Subject: [PATCH] refactor(stm32mp1): re-order drivers init SYSCFG can be initialized later, after console is up, to display the warnings or messages it could issue. PMIC should be initialized earlier, before SYSCFG init. Change-Id: Icc3a1366083a1b1fde7f0e173645449b4c04c49b Signed-off-by: Yann Gautier --- plat/st/stm32mp1/bl2_plat_setup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index 512afa832..2b878332a 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -130,10 +130,6 @@ void bl2_platform_setup(void) { int ret; - if (dt_pmic_status() > 0) { - initialize_pmic(); - } - ret = stm32mp1_ddr_probe(); if (ret < 0) { ERROR("Invalid DDR init: error %d\n", ret); @@ -247,8 +243,6 @@ void bl2_el3_plat_arch_setup(void) panic(); } - stm32mp1_syscfg_init(); - stm32_save_boot_interface(boot_context->boot_interface_selected, boot_context->boot_interface_instance); @@ -277,6 +271,12 @@ void bl2_el3_plat_arch_setup(void) } skip_console_init: + if (dt_pmic_status() > 0) { + initialize_pmic(); + } + + stm32mp1_syscfg_init(); + if (stm32_iwdg_init() < 0) { panic(); }