arch: arm: replace PLATFORM_SPECIFIC_INIT with PLATFORM_RESET_HOOK

Use generic hook infrastrucutre instead of custom Kconfig and hooks for
ARM.

Replace z_arm_platform_init() with platform_reset().

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

arch/arm/core/Kconfig

@@ -166,11 +166,15 @@ config RUNTIME_NMI
 	  needed, enable this option and attach it via z_arm_nmi_set_handler().
 
 config PLATFORM_SPECIFIC_INIT
-	bool "Platform (SOC) specific startup hook"
+	bool "Platform (SOC) specific startup hook [DEPRECATED]"
+	select DEPRECATED
+	select SOC_RESET_HOOK
 	help
 	  The platform specific initialization code (z_arm_platform_init) is
 	  executed at the beginning of the startup code (__start).
 
+	  This option is deprecated, use SOC_RESET_HOOK instead.
+
 config FAULT_DUMP
 	int "Fault dump level"
 	default 2

arch/arm/core/cortex_a_r/reset.S

@@ -30,8 +30,8 @@ GDATA(z_arm_sys_stack)
 GDATA(z_arm_fiq_stack)
 GDATA(z_arm_abort_stack)
 GDATA(z_arm_undef_stack)
-#if defined(CONFIG_PLATFORM_SPECIFIC_INIT)
-GTEXT(z_arm_platform_init)
+#if defined(CONFIG_SOC_RESET_HOOK)
+GTEXT(soc_reset_hook)
 #endif
 
 /**
@@ -305,9 +305,9 @@ _primary_core:
     msr CPSR_c, #(MODE_SYS | I_BIT | F_BIT)
     mov sp, r10
 
-#if defined(CONFIG_PLATFORM_SPECIFIC_INIT)
+#if defined(CONFIG_SOC_RESET_HOOK)
     /* Execute platform-specific initialisation if applicable */
-    bl z_arm_platform_init
+    bl soc_reset_hook
 #endif
 
 #if defined(CONFIG_WDOG_INIT)

arch/arm/core/cortex_m/reset.S

@@ -24,8 +24,8 @@ GDATA(z_interrupt_stacks)
 #if defined(CONFIG_DEBUG_THREAD_INFO)
 GDATA(z_sys_post_kernel)
 #endif
-#if defined(CONFIG_PLATFORM_SPECIFIC_INIT)
-GTEXT(z_arm_platform_init)
+#if defined(CONFIG_SOC_RESET_HOOK)
+GTEXT(soc_reset_hook)
 #endif
 #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT)
 GTEXT(z_arm_init_arch_hw_at_boot)
@@ -93,8 +93,8 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
     bl arch_pm_s2ram_resume
 #endif /* CONFIG_PM_S2RAM */
 
-#if defined(CONFIG_PLATFORM_SPECIFIC_INIT)
-    bl z_arm_platform_init
+#if defined(CONFIG_SOC_RESET_HOOK)
+    bl soc_reset_hook
 #endif
 
 #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT)

drivers/clock_control/clock_control_numaker_scc.c

@@ -136,7 +136,7 @@ static int numaker_scc_init(const struct device *dev)
 #endif
 
 	/*
-	 * z_arm_platform_init() will respect above configurations and
+	 * soc_reset_hook() will respect above configurations and
 	 * actually take charge of system clock control initialization.
 	 */
 

samples/drivers/ipm/ipm_mcux/remote/prj.conf

@@ -1,6 +1,6 @@
 CONFIG_STDOUT_CONSOLE=n
 CONFIG_PRINTK=n
 CONFIG_IPM=y
-CONFIG_PLATFORM_SPECIFIC_INIT=n
+CONFIG_SOC_RESET_HOOK=n
 CONFIG_SECOND_CORE_MCUX=y
 CONFIG_BUILD_OUTPUT_HEX=y

samples/subsys/ipc/openamp/remote/prj.conf

@@ -1,7 +1,7 @@
 CONFIG_STDOUT_CONSOLE=n
 CONFIG_PRINTK=n
 CONFIG_IPM=y
-CONFIG_PLATFORM_SPECIFIC_INIT=n
+CONFIG_SOC_RESET_HOOK=n
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_OPENAMP=y
 CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096

samples/subsys/ipc/openamp_rsc_table/boards/colibri_imx7d_mcimx7d_m4.conf

@@ -1,7 +1,7 @@
 CONFIG_IPM=y
 CONFIG_IPM_IMX_MAX_DATA_SIZE_4=y
 CONFIG_OPENAMP_WITH_DCACHE=y
-CONFIG_PLATFORM_SPECIFIC_INIT=n
+CONFIG_SOC_RESET_HOOK=n
 CONFIG_OPENAMP=y
 CONFIG_OPENAMP_RSC_TABLE_NUM_RPMSG_BUFF=32
 CONFIG_OPENAMP_RSC_TABLE=y

samples/subsys/ipc/openamp_rsc_table/boards/stm32mp157c_dk2.conf

@@ -1 +1 @@
-CONFIG_PLATFORM_SPECIFIC_INIT=n
+CONFIG_SOC_RESET_HOOK=n

soc/arm/fvp_aemv8r/Kconfig

@@ -13,5 +13,5 @@ config SOC_FVP_AEMV8R_AARCH32
 	select CPU_HAS_MPU
 	select VFP_DP_D32_FP16_FMAC if !USE_SWITCH
 	select GIC_SINGLE_SECURITY_STATE
-	select PLATFORM_SPECIFIC_INIT
+	select SOC_RESET_HOOK
 	select ARM

soc/arm/fvp_aemv8r/aarch32/soc.c

@@ -8,7 +8,7 @@
 #include <cmsis_core.h>
 #include <zephyr/sys/barrier.h>
 
-void z_arm_platform_init(void)
+void soc_reset_hook(void)
 {
 	if (IS_ENABLED(CONFIG_ICACHE)) {
 		if (!(__get_SCTLR() & SCTLR_I_Msk)) {