From 8a16c72023226251c5f083f0808933487e429bba Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 10 Sep 2024 09:42:37 -0400 Subject: [PATCH] soc: lowrisc: move init code from SYS_INIT to hooks Replace SYS_INIT with SoC hooks and adapt SoC init code Signed-off-by: Anas Nashif --- soc/lowrisc/opentitan/Kconfig | 1 + soc/lowrisc/opentitan/soc.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/soc/lowrisc/opentitan/Kconfig b/soc/lowrisc/opentitan/Kconfig index e4a6082cc5b..36662709cce 100644 --- a/soc/lowrisc/opentitan/Kconfig +++ b/soc/lowrisc/opentitan/Kconfig @@ -20,3 +20,4 @@ config SOC_OPENTITAN select RISCV_VECTORED_MODE select GEN_IRQ_VECTOR_TABLE imply XIP + select SOC_EARLY_INIT_HOOK diff --git a/soc/lowrisc/opentitan/soc.c b/soc/lowrisc/opentitan/soc.c index d627356c58f..79990d90493 100644 --- a/soc/lowrisc/opentitan/soc.c +++ b/soc/lowrisc/opentitan/soc.c @@ -26,7 +26,7 @@ #define RV_TIMER_LOWER0_OFFSET 0x110 #define RV_TIMER_COMPARE_LOWER0_OFFSET 0x118 -static int soc_opentitan_init(void) +void soc_early_init_hook(void) { /* Enable the watchdog reset (bit 1). */ sys_write32(2u, PWRMGR_BASE + PWRMGR_RESET_EN_REG_OFFSET); @@ -40,6 +40,4 @@ static int soc_opentitan_init(void) sys_write32(1u, RV_TIMER_BASE + RV_TIMER_CTRL_REG_OFFSET); /* Enable timer interrupts. */ sys_write32(1u, RV_TIMER_BASE + RV_TIMER_INTR_ENABLE_REG_OFFSET); - return 0; } -SYS_INIT(soc_opentitan_init, PRE_KERNEL_1, 0);