mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
arm: stm32mp: move dbgmcu_init call when DT is ready
As the dbgmcu_init use the function bsec_dbgswenable which is based
on the DM and DT, its call can't be done before the spl is initialized
(driver model, DT and malloc) in board_init_f::spl_early_init().
This function call is moved later in spl_board_init().
Fixes: bd3f60d29c
("arm: stm32mp: protect DBGMCU_IDC access with BSEC")
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
parent
1db942b67d
commit
97f7e39def
@ -1,6 +1,7 @@
|
||||
if ARCH_STM32MP
|
||||
|
||||
config SPL
|
||||
select SPL_BOARD_INIT
|
||||
select SPL_CLK
|
||||
select SPL_DM
|
||||
select SPL_DM_SEQ_ALIAS
|
||||
|
@ -154,16 +154,21 @@ static void security_init(void)
|
||||
*/
|
||||
static void dbgmcu_init(void)
|
||||
{
|
||||
setbits_le32(RCC_DBGCFGR, RCC_DBGCFGR_DBGCKEN);
|
||||
|
||||
/*
|
||||
* Freeze IWDG2 if Cortex-A7 is in debug mode
|
||||
* done in TF-A for TRUSTED boot and
|
||||
* DBGMCU access is controlled by BSEC_DENABLE.DBGSWENABLE
|
||||
*/
|
||||
if (!IS_ENABLED(CONFIG_TFABOOT) && bsec_dbgswenable())
|
||||
if (!IS_ENABLED(CONFIG_TFABOOT) && bsec_dbgswenable()) {
|
||||
setbits_le32(RCC_DBGCFGR, RCC_DBGCFGR_DBGCKEN);
|
||||
setbits_le32(DBGMCU_APB4FZ1, DBGMCU_APB4FZ1_IWDG2);
|
||||
}
|
||||
}
|
||||
|
||||
void spl_board_init(void)
|
||||
{
|
||||
dbgmcu_init();
|
||||
}
|
||||
#endif /* !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) */
|
||||
|
||||
#if !defined(CONFIG_TFABOOT) && \
|
||||
@ -241,7 +246,6 @@ int arch_cpu_init(void)
|
||||
timer_init();
|
||||
|
||||
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
|
||||
dbgmcu_init();
|
||||
#ifndef CONFIG_TFABOOT
|
||||
security_init();
|
||||
update_bootmode();
|
||||
|
Loading…
Reference in New Issue
Block a user