From 1706b4dfaa5b5d4b8829d08d0eb4b4a217f750e9 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Mon, 21 Jun 2021 12:22:24 +0200 Subject: [PATCH] arm: rename z_platform_init to z_arm_platform_init Platform specific initialization during early boot has been a feature supported only by Cortex-M; the Kconfig symbol is defined in arch/arm Kconfig space. We rename the z_platform_init() function to z_arm_platform_init(), to indicate more clearly that this is an internal, private ARM-only API. This commit does not introduce behavioral changes. Signed-off-by: Ioannis Glaropoulos --- arch/arm/core/aarch32/Kconfig | 4 ++-- arch/arm/core/aarch32/cortex_m/reset.S | 4 ++-- soc/arm/infineon_xmc/4xxx/soc.c | 2 +- soc/arm/nordic_nrf/common/soc_nrf_common.S | 6 +++--- soc/arm/nuvoton/m48x/soc.c | 2 +- soc/arm/renesas_rcar/gen3/soc.c | 2 +- soc/arm/xilinx_zynqmp/soc.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/core/aarch32/Kconfig b/arch/arm/core/aarch32/Kconfig index 9e40d1b6ba6e..6439b3638669 100644 --- a/arch/arm/core/aarch32/Kconfig +++ b/arch/arm/core/aarch32/Kconfig @@ -132,8 +132,8 @@ config RUNTIME_NMI config PLATFORM_SPECIFIC_INIT bool "Enable platform (SOC) specific startup hook" help - The platform specific initialization code (z_platform_init) is executed - at the beginning of the startup code (__start). + The platform specific initialization code (z_arm_platform_init) is + executed at the beginning of the startup code (__start). config FAULT_DUMP int "Fault dump level" diff --git a/arch/arm/core/aarch32/cortex_m/reset.S b/arch/arm/core/aarch32/cortex_m/reset.S index c7ed3c2742cd..25b7ebecca6b 100644 --- a/arch/arm/core/aarch32/cortex_m/reset.S +++ b/arch/arm/core/aarch32/cortex_m/reset.S @@ -22,7 +22,7 @@ GTEXT(z_arm_reset) GTEXT(memset) GDATA(z_interrupt_stacks) #if defined(CONFIG_PLATFORM_SPECIFIC_INIT) -GTEXT(z_platform_init) +GTEXT(z_arm_platform_init) #endif #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT) GTEXT(z_arm_init_arch_hw_at_boot) @@ -79,7 +79,7 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start) #endif /* CONFIG_INIT_ARCH_HW_AT_BOOT */ #if defined(CONFIG_PLATFORM_SPECIFIC_INIT) - bl z_platform_init + bl z_arm_platform_init #endif #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT) diff --git a/soc/arm/infineon_xmc/4xxx/soc.c b/soc/arm/infineon_xmc/4xxx/soc.c index 4fee581ac3af..276c1e6ddb4f 100644 --- a/soc/arm/infineon_xmc/4xxx/soc.c +++ b/soc/arm/infineon_xmc/4xxx/soc.c @@ -12,7 +12,7 @@ #define PMU_FLASH_WS (0x3U) -void z_platform_init(void) +void z_arm_platform_init(void) { uint32_t temp; diff --git a/soc/arm/nordic_nrf/common/soc_nrf_common.S b/soc/arm/nordic_nrf/common/soc_nrf_common.S index 0b78ffcbc301..39c3aa5e92b5 100644 --- a/soc/arm/nordic_nrf/common/soc_nrf_common.S +++ b/soc/arm/nordic_nrf/common/soc_nrf_common.S @@ -14,11 +14,11 @@ _ASM_FILE_PROLOGUE GTEXT(SystemInit) -GTEXT(z_platform_init) +GTEXT(z_arm_platform_init) -SECTION_FUNC(TEXT, z_platform_init) +SECTION_FUNC(TEXT, z_arm_platform_init) - /* Implement z_platform_init() directly in ASM, + /* Implement z_arm_platform_init() directly in ASM, * and ensure no stack access is performed until * we jump to SystemInit(). */ diff --git a/soc/arm/nuvoton/m48x/soc.c b/soc/arm/nuvoton/m48x/soc.c index dae822a532bb..6127a170cda5 100644 --- a/soc/arm/nuvoton/m48x/soc.c +++ b/soc/arm/nuvoton/m48x/soc.c @@ -8,7 +8,7 @@ #include #include -void z_platform_init(void) +void z_arm_platform_init(void) { SYS_UnlockReg(); diff --git a/soc/arm/renesas_rcar/gen3/soc.c b/soc/arm/renesas_rcar/gen3/soc.c index 087a64d62f36..49f1df026c34 100644 --- a/soc/arm/renesas_rcar/gen3/soc.c +++ b/soc/arm/renesas_rcar/gen3/soc.c @@ -27,7 +27,7 @@ static int soc_init(const struct device *arg) return 0; } -void z_platform_init(void) +void z_arm_platform_init(void) { L1C_DisableCaches(); L1C_DisableBTAC(); diff --git a/soc/arm/xilinx_zynqmp/soc.c b/soc/arm/xilinx_zynqmp/soc.c index 0732e4d161e2..cdf996c4df42 100644 --- a/soc/arm/xilinx_zynqmp/soc.c +++ b/soc/arm/xilinx_zynqmp/soc.c @@ -30,7 +30,7 @@ static int soc_init(const struct device *arg) SYS_INIT(soc_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); -void z_platform_init(void) +void z_arm_platform_init(void) { /* * Use normal exception vectors address range (0x0-0x1C).