Skip to content

Commit

Permalink
arm: rename z_platform_init to z_arm_platform_init
Browse files Browse the repository at this point in the history
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 <Ioannis.Glaropoulos@nordicsemi.no>
  • Loading branch information
ioannisg authored and cfriedt committed Jul 29, 2021
1 parent ab7258a commit 1706b4d
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions arch/arm/core/aarch32/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/core/aarch32/cortex_m/reset.S
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion soc/arm/infineon_xmc/4xxx/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#define PMU_FLASH_WS (0x3U)

void z_platform_init(void)
void z_arm_platform_init(void)
{
uint32_t temp;

Expand Down
6 changes: 3 additions & 3 deletions soc/arm/nordic_nrf/common/soc_nrf_common.S
Original file line number Diff line number Diff line change
Expand Up @@ -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().
*/
Expand Down
2 changes: 1 addition & 1 deletion soc/arm/nuvoton/m48x/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <init.h>
#include <kernel.h>

void z_platform_init(void)
void z_arm_platform_init(void)
{
SYS_UnlockReg();

Expand Down
2 changes: 1 addition & 1 deletion soc/arm/renesas_rcar/gen3/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion soc/arm/xilinx_zynqmp/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down

0 comments on commit 1706b4d

Please sign in to comment.