Skip to content

Commit

Permalink
core: arm: Rename main_secondary_init_intc() to secondary_init_intc()
Browse files Browse the repository at this point in the history
main_secondary_*() is an ambiguous name since it conveys no meaning
relative to the purpose of the function. Fix it by renameing to
secondary_init_intc().

Signed-off-by: Alvin Chang <alvinga@andestech.com>
  • Loading branch information
gagachang committed Jul 31, 2023
1 parent 69715ce commit 675a07f
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions core/arch/arm/kernel/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ __weak void primary_init_intc(void)
}

/* May be overridden in plat-$(PLATFORM)/main.c */
__weak void main_secondary_init_intc(void)
__weak void secondary_init_intc(void)
{
}

Expand Down Expand Up @@ -1227,7 +1227,7 @@ static void init_secondary_helper(unsigned long nsec_entry)
secondary_init_cntfrq();
thread_init_per_cpu();
init_sec_mon(nsec_entry);
main_secondary_init_intc();
secondary_init_intc();
init_vfp_sec();
init_vfp_nsec();

Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-aspeed/platform_ast2600.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void primary_init_intc(void)
gic_init(GIC_BASE + GICC_OFFSET, GIC_BASE + GICD_OFFSET);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-aspeed/platform_ast2700.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void primary_init_intc(void)
gic_init(0, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-corstone1000/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-imx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void primary_init_intc(void)
}

#if CFG_TEE_CORE_NB_CORE > 1
void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-imx/pm/cpuidle-imx7d.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ int imx7d_lowpower_idle(uint32_t power_state __unused,
gic_inited = 1;
DMSG("=== Back from Suspended ===\n");
} else {
main_secondary_init_intc();
secondary_init_intc();
gic_inited = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-k3/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-ls/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void primary_init_intc(void)
gic_init(gic_base + gicc_offset, gic_base + gicd_offset);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rcar/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rockchip/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rzn1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-stm/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void primary_init_intc(void)
gic_init(GIC_CPU_BASE, GIC_DIST_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-stm32mp1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void primary_init_intc(void)
stm32mp_register_online_cpu();
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();

Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-sunxi/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void primary_init_intc(void)
gic_init(GIC_BASE + GICC_OFFSET, GIC_BASE + GICD_OFFSET);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-ti/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void primary_init_intc(void)
gic_init(GICC_BASE, GICD_BASE);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-vexpress/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void primary_init_intc(void)
}

#if !defined(CFG_WITH_ARM_TRUSTED_FW)
void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-zynq7k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void primary_init_intc(void)
gic_init(GIC_BASE + GICC_OFFSET, GIC_BASE + GICD_OFFSET);
}

void main_secondary_init_intc(void)
void secondary_init_intc(void)
{
gic_cpu_init();
}
Expand Down
2 changes: 1 addition & 1 deletion core/include/kernel/boot.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void boot_init_secondary(unsigned long nsec_entry);
#endif

void primary_init_intc(void);
void main_secondary_init_intc(void);
void secondary_init_intc(void);

void init_sec_mon(unsigned long nsec_entry);
void init_tee_runtime(void);
Expand Down

0 comments on commit 675a07f

Please sign in to comment.