core: remove generic_ from generic_boot

Now that the CFG_GENERIC_BOOT configuration flag has been removed also
remove "generic_" prefix from and in the related files.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

59 files changed, 130 insertions, 131 deletions

diff --git a/core/arch/arm/include/kernel/generic_boot.h b/core/arch/arm/include/kernel/boot.h
index f1e27302..5b06507f 100644
--- a/core/arch/arm/include/kernel/generic_boot.h
+++ b/core/arch/arm/include/kernel/boot.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 /*
- * Copyright (c) 2015, Linaro Limited
+ * Copyright (c) 2015-2020, Linaro Limited
  */
-#ifndef KERNEL_GENERIC_BOOT_H
-#define KERNEL_GENERIC_BOOT_H
+#ifndef __KERNEL_BOOT_H
+#define __KERNEL_BOOT_H
 
 #include <initcall.h>
 #include <types_ext.h>
@@ -43,16 +43,16 @@ extern uint8_t embedded_secure_dtb[];
 extern const struct core_mmu_config boot_mmu_config;
 
 /* @nsec_entry is unused if using CFG_WITH_ARM_TRUSTED_FW */
-void generic_boot_init_primary(unsigned long pageable_part,
-			       unsigned long nsec_entry, unsigned long fdt);
+void boot_init_primary(unsigned long pageable_part, unsigned long nsec_entry,
+		       unsigned long fdt);
 
 void paged_init_primary(unsigned long fdt);
 
 #if defined(CFG_WITH_ARM_TRUSTED_FW)
 unsigned long cpu_on_handler(unsigned long a0, unsigned long a1);
-unsigned long generic_boot_cpu_on_handler(unsigned long a0, unsigned long a1);
+unsigned long boot_cpu_on_handler(unsigned long a0, unsigned long a1);
 #else
-void generic_boot_init_secondary(unsigned long nsec_entry);
+void boot_init_secondary(unsigned long nsec_entry);
 #endif
 
 void main_init_gic(void);
@@ -61,7 +61,7 @@ void main_secondary_init_gic(void);
 void init_sec_mon(unsigned long nsec_entry);
 void init_tee_runtime(void);
 
-const struct thread_handlers *generic_boot_get_handlers(void);
+const struct thread_handlers *boot_get_handlers(void);
 
 /* weak routines eventually overridden by platform */
 void plat_cpu_reset_early(void);
@@ -70,11 +70,11 @@ void arm_cl2_config(vaddr_t pl310);
 void arm_cl2_enable(vaddr_t pl310);
 
 #if defined(CFG_BOOT_SECONDARY_REQUEST)
-void generic_boot_set_core_ns_entry(size_t core_idx, uintptr_t entry,
-				    uintptr_t context_id);
+void boot_set_core_ns_entry(size_t core_idx, uintptr_t entry,
+			    uintptr_t context_id);
 
-int generic_boot_core_release(size_t core_idx, paddr_t entry);
-struct ns_entry_context *generic_boot_core_hpen(void);
+int boot_core_release(size_t core_idx, paddr_t entry);
+struct ns_entry_context *boot_core_hpen(void);
 #endif
 
 /* Returns embedded DTB if present, then external DTB if found, then NULL */
@@ -88,4 +88,4 @@ void *get_external_dt(void);
 
 unsigned long get_aslr_seed(void *fdt);
 
-#endif /* KERNEL_GENERIC_BOOT_H */
+#endif /* __KERNEL_BOOT_H */
diff --git a/core/arch/arm/kernel/asm-defines.c b/core/arch/arm/kernel/asm-defines.c
index 6683b9ed..abe46a71 100644
--- a/core/arch/arm/kernel/asm-defines.c
+++ b/core/arch/arm/kernel/asm-defines.c
@@ -4,7 +4,7 @@
  */
 
 #include <gen-asm-defines.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/thread.h>
 #include <sm/pm.h>
 #include <sm/sm.h>
diff --git a/core/arch/arm/kernel/generic_boot.c b/core/arch/arm/kernel/boot.c
index be4c3b04..d065b56b 100644
--- a/core/arch/arm/kernel/generic_boot.c
+++ b/core/arch/arm/kernel/boot.c
@@ -12,7 +12,7 @@
 #include <inttypes.h>
 #include <keep.h>
 #include <kernel/asan.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/linker.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -1134,8 +1134,7 @@ void init_tee_runtime(void)
 		panic();
 }
 
-static void generic_init_primary(unsigned long pageable_part,
-				 unsigned long nsec_entry)
+static void init_primary(unsigned long pageable_part, unsigned long nsec_entry)
 {
 	/*
 	 * Mask asynchronous exceptions before switch to the thread vector
@@ -1152,7 +1151,7 @@ static void generic_init_primary(unsigned long pageable_part,
 #ifndef CFG_VIRTUALIZATION
 	thread_init_boot_thread();
 #endif
-	thread_init_primary(generic_boot_get_handlers());
+	thread_init_primary(boot_get_handlers());
 	thread_init_per_cpu();
 	init_sec_mon(nsec_entry);
 }
@@ -1189,7 +1188,7 @@ void __weak paged_init_primary(unsigned long fdt)
 }
 
 /* What this function is using is needed each time another CPU is started */
-DECLARE_KEEP_PAGER(generic_boot_get_handlers);
+DECLARE_KEEP_PAGER(boot_get_handlers);
 
 static void init_secondary_helper(unsigned long nsec_entry)
 {
@@ -1216,9 +1215,9 @@ static void init_secondary_helper(unsigned long nsec_entry)
  * Note: this function is weak just to make it possible to exclude it from
  * the unpaged area so that it lies in the init area.
  */
-void __weak generic_boot_init_primary(unsigned long pageable_part,
-				      unsigned long nsec_entry __maybe_unused,
-				      unsigned long fdt)
+void __weak boot_init_primary(unsigned long pageable_part,
+			      unsigned long nsec_entry __maybe_unused,
+			      unsigned long fdt)
 {
 	unsigned long e = PADDR_INVALID;
 
@@ -1226,35 +1225,35 @@ void __weak generic_boot_init_primary(unsigned long pageable_part,
 	e = nsec_entry;
 #endif
 
-	generic_init_primary(pageable_part, e);
+	init_primary(pageable_part, e);
 	paged_init_primary(fdt);
 }
 
 #if defined(CFG_WITH_ARM_TRUSTED_FW)
-unsigned long generic_boot_cpu_on_handler(unsigned long a0 __maybe_unused,
-				     unsigned long a1 __unused)
+unsigned long boot_cpu_on_handler(unsigned long a0 __maybe_unused,
+				  unsigned long a1 __unused)
 {
 	DMSG("cpu %zu: a0 0x%lx", get_core_pos(), a0);
 	init_secondary_helper(PADDR_INVALID);
 	return 0;
 }
 #else
-void generic_boot_init_secondary(unsigned long nsec_entry)
+void boot_init_secondary(unsigned long nsec_entry)
 {
 	init_secondary_helper(nsec_entry);
 }
 #endif
 
 #if defined(CFG_BOOT_SECONDARY_REQUEST)
-void generic_boot_set_core_ns_entry(size_t core_idx, uintptr_t entry,
-				    uintptr_t context_id)
+void boot_set_core_ns_entry(size_t core_idx, uintptr_t entry,
+			    uintptr_t context_id)
 {
 	ns_entry_contexts[core_idx].entry_point = entry;
 	ns_entry_contexts[core_idx].context_id = context_id;
 	dsb_ishst();
 }
 
-int generic_boot_core_release(size_t core_idx, paddr_t entry)
+int boot_core_release(size_t core_idx, paddr_t entry)
 {
 	if (!core_idx || core_idx >= CFG_TEE_CORE_NB_CORE)
 		return -1;
@@ -1272,7 +1271,7 @@ int generic_boot_core_release(size_t core_idx, paddr_t entry)
  * spin until secondary boot request, then returns with
  * the secondary core entry address.
  */
-struct ns_entry_context *generic_boot_core_hpen(void)
+struct ns_entry_context *boot_core_hpen(void)
 {
 #ifdef CFG_PSCI_ARM32
 	return &ns_entry_contexts[get_core_pos()];
diff --git a/core/arch/arm/kernel/generic_entry_a32.S b/core/arch/arm/kernel/entry_a32.S
index 6fac6768..ccbdc00a 100644
--- a/core/arch/arm/kernel/generic_entry_a32.S
+++ b/core/arch/arm/kernel/entry_a32.S
@@ -525,7 +525,7 @@ shadow_stack_access_ok:
 	mov	r0, r4		/* pageable part address */
 	mov	r1, r5		/* ns-entry address */
 	mov	r2, r6		/* DT address */
-	bl	generic_boot_init_primary
+	bl	boot_init_primary
 
 	/*
 	 * In case we've touched memory that secondary CPUs will use before
@@ -553,7 +553,7 @@ shadow_stack_access_ok:
 	/*
 	 * Clear current thread id now to allow the thread to be reused on
 	 * next entry. Matches the thread_init_boot_thread() in
-	 * generic_boot.c.
+	 * boot.c.
 	 */
 	bl 	thread_clr_boot_thread
 
@@ -807,7 +807,7 @@ UNWIND(	.cantunwind)
 
 	mov	r0, r4
 	mov	r1, r5
-	bl	generic_boot_cpu_on_handler
+	bl	boot_cpu_on_handler
 
 	bx	r6
 UNWIND(	.fnend)
@@ -850,16 +850,16 @@ UNWIND(	.cantunwind)
 
 #if defined (CFG_BOOT_SECONDARY_REQUEST)
 	/*
-	 * generic_boot_core_hpen return value (r0) is address of
+	 * boot_core_hpen() return value (r0) is address of
 	 * ns entry context structure
 	 */
-	bl	generic_boot_core_hpen
+	bl	boot_core_hpen
 	ldm	r0, {r0, r6}
 #else
 	mov	r0, r5		/* ns-entry address */
 	mov	r6, #0
 #endif
-	bl	generic_boot_init_secondary
+	bl	boot_init_secondary
 
 	mov	r0, #TEESMC_OPTEED_RETURN_ENTRY_DONE
 	mov	r1, r6
diff --git a/core/arch/arm/kernel/generic_entry_a64.S b/core/arch/arm/kernel/entry_a64.S
index 77b2b1c4..b27d5252 100644
--- a/core/arch/arm/kernel/generic_entry_a64.S
+++ b/core/arch/arm/kernel/entry_a64.S
@@ -207,7 +207,7 @@ clear_nex_bss:
 	mov	x0, x19		/* pagable part address */
 	mov	x1, #-1
 	mov	x2, x20		/* DT address */
-	bl	generic_boot_init_primary
+	bl	boot_init_primary
 
 	/*
 	 * In case we've touched memory that secondary CPUs will use before
@@ -223,7 +223,7 @@ clear_nex_bss:
 	/*
 	 * Clear current thread id now to allow the thread to be reused on
 	 * next entry. Matches the thread_init_boot_thread in
-	 * generic_boot.c.
+	 * boot.c.
 	 */
 #ifndef CFG_VIRTUALIZATION
 	bl 	thread_clr_boot_thread
@@ -402,7 +402,7 @@ FUNC cpu_on_handler , :
 	mov	x0, x19
 	mov	x1, x20
 	mov	x30, x21
-	b	generic_boot_cpu_on_handler
+	b	boot_cpu_on_handler
 END_FUNC cpu_on_handler
 DECLARE_KEEP_PAGER cpu_on_handler
 
diff --git a/core/arch/arm/kernel/link_dummies_init.c b/core/arch/arm/kernel/link_dummies_init.c
index 8cd8a8e5..5be37da0 100644
--- a/core/arch/arm/kernel/link_dummies_init.c
+++ b/core/arch/arm/kernel/link_dummies_init.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2020, Linaro Limited
  */
 #include <compiler.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <mm/core_mmu.h>
 
 unsigned long __section(".text.dummy.get_aslr_seed")
@@ -18,9 +18,9 @@ core_init_mmu_map(unsigned long seed __unused,
 {
 }
 
-void __section(".text.dummy.generic_boot_init_primary")
-generic_boot_init_primary(unsigned long pageable_part __unused,
-			  unsigned long nsec_entry __unused,
-			  unsigned long fdt __unused)
+void __section(".text.dummy.boot_init_primary")
+boot_init_primary(unsigned long pageable_part __unused,
+		  unsigned long nsec_entry __unused,
+		  unsigned long fdt __unused)
 {
 }
diff --git a/core/arch/arm/kernel/link_dummies_paged.c b/core/arch/arm/kernel/link_dummies_paged.c
index 50245b3c..65e026c8 100644
--- a/core/arch/arm/kernel/link_dummies_paged.c
+++ b/core/arch/arm/kernel/link_dummies_paged.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2017, Linaro Limited
  */
 #include <compiler.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/thread.h>
 #include <kernel/wait_queue.h>
 #include <sm/tee_mon.h>
diff --git a/core/arch/arm/kernel/sub.mk b/core/arch/arm/kernel/sub.mk
index 154100f5..cdaba8c9 100644
--- a/core/arch/arm/kernel/sub.mk
+++ b/core/arch/arm/kernel/sub.mk
@@ -43,9 +43,9 @@ srcs-$(CFG_LOCKDEP) += mutex_lockdep.c
 srcs-y += wait_queue.c
 srcs-$(CFG_PM_STUBS) += pm_stubs.c
 
-srcs-y += generic_boot.c
-srcs-$(CFG_ARM32_core) += generic_entry_a32.S
-srcs-$(CFG_ARM64_core) += generic_entry_a64.S
+srcs-y += boot.c
+srcs-$(CFG_ARM32_core) += entry_a32.S
+srcs-$(CFG_ARM64_core) += entry_a64.S
 
 ifeq ($(CFG_UNWIND),y)
 srcs-y += unwind_arm32.c
diff --git a/core/arch/arm/kernel/virtualization.c b/core/arch/arm/kernel/virtualization.c
index aaa5f83a..7c52c2b2 100644
--- a/core/arch/arm/kernel/virtualization.c
+++ b/core/arch/arm/kernel/virtualization.c
@@ -3,7 +3,7 @@
 
 #include <compiler.h>
 #include <platform_config.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/linker.h>
 #include <kernel/mutex.h>
 #include <kernel/misc.h>
diff --git a/core/arch/arm/mm/core_mmu.c b/core/arch/arm/mm/core_mmu.c
index fced2df9..1cc42664 100644
--- a/core/arch/arm/mm/core_mmu.c
+++ b/core/arch/arm/mm/core_mmu.c
@@ -9,7 +9,7 @@
 #include <bitstring.h>
 #include <config.h>
 #include <kernel/cache_helpers.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/linker.h>
 #include <kernel/panic.h>
 #include <kernel/spinlock.h>
diff --git a/core/arch/arm/plat-amlogic/main.c b/core/arch/arm/plat-amlogic/main.c
index f2560528..9c928257 100644
--- a/core/arch/arm/plat-amlogic/main.c
+++ b/core/arch/arm/plat-amlogic/main.c
@@ -4,7 +4,7 @@
  */
 
 #include <console.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/core_memprot.h>
@@ -23,7 +23,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_do_nothing,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-bcm/main.c b/core/arch/arm/plat-bcm/main.c
index dd0dac26..46bf62d4 100644
--- a/core/arch/arm/plat-bcm/main.c
+++ b/core/arch/arm/plat-bcm/main.c
@@ -7,7 +7,7 @@
 #include <console.h>
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -68,7 +68,7 @@ register_phys_mem(MEM_AREA_IO_NSEC, CFG_BCM_ELOG_AP_UART_LOG_BASE,
 register_phys_mem(MEM_AREA_RAM_NSEC, CFG_BCM_ELOG_BASE, CFG_BCM_ELOG_SIZE);
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-d02/main.c b/core/arch/arm/plat-d02/main.c
index a4f418a8..146b8d05 100644
--- a/core/arch/arm/plat-d02/main.c
+++ b/core/arch/arm/plat-d02/main.c
@@ -5,7 +5,7 @@
 
 #include <console.h>
 #include <drivers/hi16xx_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/tee_pager.h>
@@ -29,7 +29,7 @@ static struct hi16xx_uart_data console_data;
 register_phys_mem_pgdir(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE,
 			HI16XX_UART_REG_SIZE);
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-hikey/main.c b/core/arch/arm/plat-hikey/main.c
index fe39330b..661d8f2d 100644
--- a/core/arch/arm/plat-hikey/main.c
+++ b/core/arch/arm/plat-hikey/main.c
@@ -14,7 +14,7 @@
 #endif
 #include <initcall.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/tee_pager.h>
@@ -54,7 +54,7 @@ register_dynamic_shm(DRAM1_BASE, DRAM1_SIZE_NSEC);
 register_dynamic_shm(DRAM2_BASE, DRAM2_SIZE_NSEC);
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-hisilicon/main.c b/core/arch/arm/plat-hisilicon/main.c
index b7dff433..bf79415a 100644
--- a/core/arch/arm/plat-hisilicon/main.c
+++ b/core/arch/arm/plat-hisilicon/main.c
@@ -6,7 +6,7 @@
 #include <console.h>
 #include <drivers/gic.h>
 #include <drivers/pl011.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/tee_pager.h>
@@ -37,7 +37,7 @@ register_phys_mem(MEM_AREA_IO_SEC, CPU_CRG_BASE, CPU_CRG_SIZE);
 register_phys_mem(MEM_AREA_IO_SEC, SYS_CTRL_BASE, SYS_CTRL_SIZE);
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-hisilicon/psci.c b/core/arch/arm/plat-hisilicon/psci.c
index 0fc4a9a3..24b03842 100644
--- a/core/arch/arm/plat-hisilicon/psci.c
+++ b/core/arch/arm/plat-hisilicon/psci.c
@@ -5,7 +5,7 @@
 
 #include <console.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -76,7 +76,7 @@ int psci_cpu_on(uint32_t core_idx, uint32_t entry,
 		return PSCI_RET_INVALID_PARAMETERS;
 
 	/* set secondary core's NS entry addresses */
-	generic_boot_set_core_ns_entry(pos, entry, context_id);
+	boot_set_core_ns_entry(pos, entry, context_id);
 
 	val = virt_to_phys((void *)TEE_TEXT_VA_START);
 	io_write32(bootsram + REG_CPU_START_ADDR, val);
diff --git a/core/arch/arm/plat-imx/imx_pl310.c b/core/arch/arm/plat-imx/imx_pl310.c
index be8eb2ec..4f4d08ab 100644
--- a/core/arch/arm/plat-imx/imx_pl310.c
+++ b/core/arch/arm/plat-imx/imx_pl310.c
@@ -7,7 +7,7 @@
 
 #include <arm32.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/tz_ssvce_def.h>
 #include <kernel/tz_ssvce_pl310.h>
 #include <mm/core_memprot.h>
diff --git a/core/arch/arm/plat-imx/main.c b/core/arch/arm/plat-imx/main.c
index 6a5bce58..e93a5cb5 100644
--- a/core/arch/arm/plat-imx/main.c
+++ b/core/arch/arm/plat-imx/main.c
@@ -34,7 +34,7 @@
 #include <drivers/imx_uart.h>
 #include <imx.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -123,7 +123,7 @@ register_dynamic_shm(CFG_NSEC_DDR_0_BASE, CFG_NSEC_DDR_0_SIZE);
 register_dynamic_shm(CFG_NSEC_DDR_1_BASE, CFG_NSEC_DDR_1_SIZE);
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c b/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c
index 2d730e99..c7777a38 100644
--- a/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c
+++ b/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c
@@ -14,7 +14,7 @@
 #include <imx.h>
 #include <imx_pm.h>
 #include <kernel/cache_helpers.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
diff --git a/core/arch/arm/plat-imx/pm/imx7_suspend.c b/core/arch/arm/plat-imx/pm/imx7_suspend.c
index 7ba528e3..4cd361dc 100644
--- a/core/arch/arm/plat-imx/pm/imx7_suspend.c
+++ b/core/arch/arm/plat-imx/pm/imx7_suspend.c
@@ -14,7 +14,7 @@
 #include <imx_pm.h>
 #include <kernel/panic.h>
 #include <kernel/cache_helpers.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <mm/core_mmu.h>
 #include <mm/core_memprot.h>
diff --git a/core/arch/arm/plat-imx/pm/psci.c b/core/arch/arm/plat-imx/pm/psci.c
index e36fc96f..c22eba92 100644
--- a/core/arch/arm/plat-imx/pm/psci.c
+++ b/core/arch/arm/plat-imx/pm/psci.c
@@ -12,7 +12,7 @@
 #include <imx.h>
 #include <imx_pm.h>
 #include <imx-regs.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -65,7 +65,7 @@ int psci_cpu_on(uint32_t core_idx, uint32_t entry,
 		return PSCI_RET_INVALID_PARAMETERS;
 
 	/* set secondary cores' NS entry addresses */
-	generic_boot_set_core_ns_entry(core_idx, entry, context_id);
+	boot_set_core_ns_entry(core_idx, entry, context_id);
 
 	val = virt_to_phys((void *)TEE_TEXT_VA_START);
 
diff --git a/core/arch/arm/plat-k3/main.c b/core/arch/arm/plat-k3/main.c
index 60515e39..774a8f10 100644
--- a/core/arch/arm/plat-k3/main.c
+++ b/core/arch/arm/plat-k3/main.c
@@ -9,7 +9,7 @@
 #include <console.h>
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -62,7 +62,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_do_nothing,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-ls/main.c b/core/arch/arm/plat-ls/main.c
index 7a99222a..627f3520 100644
--- a/core/arch/arm/plat-ls/main.c
+++ b/core/arch/arm/plat-ls/main.c
@@ -38,7 +38,7 @@
 #include <drivers/ns16550.h>
 #endif
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -80,7 +80,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE,
 			CORE_MMU_PGDIR_SIZE);
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, GIC_BASE, CORE_MMU_PGDIR_SIZE);
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-marvell/main.c b/core/arch/arm/plat-marvell/main.c
index ddbd2053..89852b6e 100644
--- a/core/arch/arm/plat-marvell/main.c
+++ b/core/arch/arm/plat-marvell/main.c
@@ -35,7 +35,7 @@
 #include <drivers/mvebu_uart.h>
 #endif
 #include <keep.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -65,7 +65,7 @@ static struct serial8250_uart_data console_data;
 static struct mvebu_uart_data console_data;
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-mediatek/main.c b/core/arch/arm/plat-mediatek/main.c
index 6a38e58c..e0bacbbb 100644
--- a/core/arch/arm/plat-mediatek/main.c
+++ b/core/arch/arm/plat-mediatek/main.c
@@ -5,7 +5,7 @@
 
 #include <console.h>
 #include <drivers/serial8250_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/core_memprot.h>
@@ -28,7 +28,7 @@ static const struct thread_handlers handlers = {
 
 static struct serial8250_uart_data console_data;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-poplar/main.c b/core/arch/arm/plat-poplar/main.c
index a048518c..cc2e4284 100644
--- a/core/arch/arm/plat-poplar/main.c
+++ b/core/arch/arm/plat-poplar/main.c
@@ -8,7 +8,7 @@
 #ifdef CFG_PL061
 #include <drivers/pl061_gpio.h>
 #endif
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/tee_pager.h>
@@ -33,7 +33,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE, PL011_REG_SIZE);
 /* for dynamic shared memory */
 register_dynamic_shm(DRAM0_BASE_NSEC, DRAM0_SIZE_NSEC);
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-rcar/main.c b/core/arch/arm/plat-rcar/main.c
index de902285..42a5db44 100644
--- a/core/arch/arm/plat-rcar/main.c
+++ b/core/arch/arm/plat-rcar/main.c
@@ -27,7 +27,7 @@
  */
 
 #include <console.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/core_memprot.h>
@@ -62,7 +62,7 @@ static const struct thread_handlers handlers __nex_data = {
 
 static struct scif_uart_data console_data __nex_bss;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-rockchip/main.c b/core/arch/arm/plat-rockchip/main.c
index dba9a35e..99bbfbea 100644
--- a/core/arch/arm/plat-rockchip/main.c
+++ b/core/arch/arm/plat-rockchip/main.c
@@ -8,7 +8,7 @@
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/core_memprot.h>
@@ -70,7 +70,7 @@ void main_secondary_init_gic(void)
 	gic_cpu_init(&gic_data);
 }
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-rockchip/psci_rk322x.c b/core/arch/arm/plat-rockchip/psci_rk322x.c
index 87b990d9..454e6f03 100644
--- a/core/arch/arm/plat-rockchip/psci_rk322x.c
+++ b/core/arch/arm/plat-rockchip/psci_rk322x.c
@@ -10,7 +10,7 @@
 #include <initcall.h>
 #include <io.h>
 #include <kernel/delay.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <mm/core_mmu.h>
@@ -259,7 +259,7 @@ int psci_cpu_on(uint32_t core_idx, uint32_t entry,
 	DMSG("core_id: %" PRIu32, core_idx);
 
 	/* set secondary cores' NS entry addresses */
-	generic_boot_set_core_ns_entry(core_idx, entry, context_id);
+	boot_set_core_ns_entry(core_idx, entry, context_id);
 
 	/* wait */
 	if (!core_held_in_reset(core_idx)) {
diff --git a/core/arch/arm/plat-rpi3/main.c b/core/arch/arm/plat-rpi3/main.c
index 5196c762..55d20887 100644
--- a/core/arch/arm/plat-rpi3/main.c
+++ b/core/arch/arm/plat-rpi3/main.c
@@ -28,7 +28,7 @@
 
 #include <console.h>
 #include <drivers/serial8250_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/core_memprot.h>
@@ -52,7 +52,7 @@ static const struct thread_handlers handlers = {
 
 static struct serial8250_uart_data console_data;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-sam/main.c b/core/arch/arm/plat-sam/main.c
index 070fd530..729741a7 100644
--- a/core/arch/arm/plat-sam/main.c
+++ b/core/arch/arm/plat-sam/main.c
@@ -30,7 +30,7 @@
 #include <console.h>
 #include <drivers/atmel_uart.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -56,7 +56,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_panic,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-sprd/main.c b/core/arch/arm/plat-sprd/main.c
index dffb3c57..9777fcc8 100644
--- a/core/arch/arm/plat-sprd/main.c
+++ b/core/arch/arm/plat-sprd/main.c
@@ -27,7 +27,7 @@
  */
 
 #include <drivers/gic.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -60,7 +60,7 @@ static const struct thread_handlers handlers = {
 
 static struct gic_data gic_data;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-stm/main.c b/core/arch/arm/plat-stm/main.c
index c91431b5..7ad948ad 100644
--- a/core/arch/arm/plat-stm/main.c
+++ b/core/arch/arm/plat-stm/main.c
@@ -8,7 +8,7 @@
 #include <drivers/gic.h>
 #include <drivers/stih_asc.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -68,7 +68,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_panic,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_clk.c b/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_clk.c
index 47240ab8..332adcaf 100644
--- a/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_clk.c
+++ b/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_clk.c
@@ -10,7 +10,7 @@
 #include <io.h>
 #include <keep.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/spinlock.h>
 #include <libfdt.h>
diff --git a/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_pmic.c b/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_pmic.c
index f0164ac5..f47efea2 100644
--- a/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_pmic.c
+++ b/core/arch/arm/plat-stm32mp1/drivers/stm32mp1_pmic.c
@@ -10,7 +10,7 @@
 #include <keep.h>
 #include <kernel/delay.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm.h>
 #include <libfdt.h>
diff --git a/core/arch/arm/plat-stm32mp1/main.c b/core/arch/arm/plat-stm32mp1/main.c
index 9947e712..d17782cb 100644
--- a/core/arch/arm/plat-stm32mp1/main.c
+++ b/core/arch/arm/plat-stm32mp1/main.c
@@ -13,7 +13,7 @@
 #include <drivers/stm32_uart.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -78,7 +78,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_panic,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-stm32mp1/pm/psci.c b/core/arch/arm/plat-stm32mp1/pm/psci.c
index 740b13b5..9cff077d 100644
--- a/core/arch/arm/plat-stm32mp1/pm/psci.c
+++ b/core/arch/arm/plat-stm32mp1/pm/psci.c
@@ -12,7 +12,7 @@
 #include <io.h>
 #include <kernel/cache_helpers.h>
 #include <kernel/delay.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -177,7 +177,7 @@ int psci_cpu_on(uint32_t core_id, uint32_t entry, uint32_t context_id)
 	unlock_state_access(exceptions);
 
 	if (rc == PSCI_RET_SUCCESS) {
-		generic_boot_set_core_ns_entry(pos, entry, context_id);
+		boot_set_core_ns_entry(pos, entry, context_id);
 		release_secondary_early_hpen(pos);
 	}
 
diff --git a/core/arch/arm/plat-stm32mp1/shared_resources.c b/core/arch/arm/plat-stm32mp1/shared_resources.c
index e321ec8d..f0b6fe2a 100644
--- a/core/arch/arm/plat-stm32mp1/shared_resources.c
+++ b/core/arch/arm/plat-stm32mp1/shared_resources.c
@@ -12,7 +12,7 @@
 #include <initcall.h>
 #include <io.h>
 #include <keep.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm.h>
 #include <kernel/spinlock.h>
diff --git a/core/arch/arm/plat-sunxi/main.c b/core/arch/arm/plat-sunxi/main.c
index ee18fe23..13168bf9 100644
--- a/core/arch/arm/plat-sunxi/main.c
+++ b/core/arch/arm/plat-sunxi/main.c
@@ -34,7 +34,7 @@
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
 #include <drivers/tzc380.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -113,7 +113,7 @@ static const struct thread_handlers handlers = {
 
 static struct serial8250_uart_data console_data;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-sunxi/psci.c b/core/arch/arm/plat-sunxi/psci.c
index be973eee..45262d58 100644
--- a/core/arch/arm/plat-sunxi/psci.c
+++ b/core/arch/arm/plat-sunxi/psci.c
@@ -32,7 +32,7 @@
 #include <console.h>
 #include <io.h>
 #include <stdint.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -84,7 +84,7 @@ int psci_cpu_on(uint32_t core_idx, uint32_t entry,
 		return PSCI_RET_INVALID_PARAMETERS;
 
 	/* set secondary cores' NS entry addresses */
-	generic_boot_set_core_ns_entry(core_idx, entry, context_id);
+	boot_set_core_ns_entry(core_idx, entry, context_id);
 
 	val = virt_to_phys((void *)TEE_TEXT_VA_START);
 
diff --git a/core/arch/arm/plat-synquacer/main.c b/core/arch/arm/plat-synquacer/main.c
index 28c8748d..6170bc66 100644
--- a/core/arch/arm/plat-synquacer/main.c
+++ b/core/arch/arm/plat-synquacer/main.c
@@ -8,7 +8,7 @@
 #include <drivers/gic.h>
 #include <drivers/pl011.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -40,7 +40,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_SEC, GIC_BASE, CORE_MMU_PGDIR_SIZE);
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, THERMAL_SENSOR_BASE,
 			CORE_MMU_PGDIR_SIZE);
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-ti/main.c b/core/arch/arm/plat-ti/main.c
index 8cd68062..ef8854bc 100644
--- a/core/arch/arm/plat-ti/main.c
+++ b/core/arch/arm/plat-ti/main.c
@@ -8,7 +8,7 @@
 #include <console.h>
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/mutex.h>
@@ -73,7 +73,7 @@ static const struct thread_handlers handlers = {
 	.system_reset = pm_panic,
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-ti/ti_pl310.c b/core/arch/arm/plat-ti/ti_pl310.c
index fc6defac..499eb5be 100644
--- a/core/arch/arm/plat-ti/ti_pl310.c
+++ b/core/arch/arm/plat-ti/ti_pl310.c
@@ -28,7 +28,7 @@
 
 #include <arm32.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/tz_ssvce_def.h>
 #include <kernel/tz_ssvce_pl310.h>
 #include <mm/core_memprot.h>
diff --git a/core/arch/arm/plat-uniphier/main.c b/core/arch/arm/plat-uniphier/main.c
index 1684512d..bf742713 100644
--- a/core/arch/arm/plat-uniphier/main.c
+++ b/core/arch/arm/plat-uniphier/main.c
@@ -8,7 +8,7 @@
 #include <drivers/gic.h>
 #include <drivers/serial8250_uart.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
 #include <mm/tee_pager.h>
@@ -49,7 +49,7 @@ static const struct thread_handlers handlers = {
 
 static struct serial8250_uart_data console_data;
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-vexpress/main.c b/core/arch/arm/plat-vexpress/main.c
index 2d5abee8..410f65dc 100644
--- a/core/arch/arm/plat-vexpress/main.c
+++ b/core/arch/arm/plat-vexpress/main.c
@@ -11,7 +11,7 @@
 #include <drivers/tzc400.h>
 #include <initcall.h>
 #include <keep.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -62,7 +62,7 @@ register_ddr(DRAM0_BASE, DRAM0_SIZE);
 register_ddr(DRAM1_BASE, DRAM1_SIZE);
 #endif
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
@@ -216,7 +216,7 @@ int psci_cpu_on(uint32_t core_id, uint32_t entry, uint32_t context_id)
 	}
 	core_is_released[pos] = true;
 
-	generic_boot_set_core_ns_entry(pos, entry, context_id);
+	boot_set_core_ns_entry(pos, entry, context_id);
 	release_secondary_early_hpen(pos);
 
 	return PSCI_RET_SUCCESS;
diff --git a/core/arch/arm/plat-zynq7k/main.c b/core/arch/arm/plat-zynq7k/main.c
index 883ff161..a0b2825b 100644
--- a/core/arch/arm/plat-zynq7k/main.c
+++ b/core/arch/arm/plat-zynq7k/main.c
@@ -33,7 +33,7 @@
 #include <drivers/cdns_uart.h>
 #include <drivers/gic.h>
 #include <io.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
@@ -64,7 +64,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_SEC, GIC_BASE, CORE_MMU_PGDIR_SIZE);
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, PL310_BASE, CORE_MMU_PGDIR_SIZE);
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, SLCR_BASE, CORE_MMU_PGDIR_SIZE);
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/plat-zynqmp/main.c b/core/arch/arm/plat-zynqmp/main.c
index 5c182c92..79f26169 100644
--- a/core/arch/arm/plat-zynqmp/main.c
+++ b/core/arch/arm/plat-zynqmp/main.c
@@ -36,7 +36,7 @@
 
 #include <arm.h>
 #include <console.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/interrupt.h>
 #include <kernel/misc.h>
 #include <kernel/pm_stubs.h>
@@ -79,7 +79,7 @@ static const struct thread_handlers handlers = {
 #endif
 };
 
-const struct thread_handlers *generic_boot_get_handlers(void)
+const struct thread_handlers *boot_get_handlers(void)
 {
 	return &handlers;
 }
diff --git a/core/arch/arm/sm/pm.c b/core/arch/arm/sm/pm.c
index 3a7ef14f..9dcc550c 100644
--- a/core/arch/arm/sm/pm.c
+++ b/core/arch/arm/sm/pm.c
@@ -10,7 +10,7 @@
 #include <drivers/imx_uart.h>
 #include <io.h>
 #include <kernel/cache_helpers.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
diff --git a/core/arch/arm/sm/psci.c b/core/arch/arm/sm/psci.c
index 0084d7e2..3ff6a79f 100644
--- a/core/arch/arm/sm/psci.c
+++ b/core/arch/arm/sm/psci.c
@@ -29,7 +29,7 @@
  */
 
 #include <console.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/thread.h>
 #include <stdint.h>
 #include <sm/optee_smc.h>
diff --git a/core/arch/arm/tee/entry_fast.c b/core/arch/arm/tee/entry_fast.c
index 82be8a30..26682baa 100644
--- a/core/arch/arm/tee/entry_fast.c
+++ b/core/arch/arm/tee/entry_fast.c
@@ -7,7 +7,7 @@
 #include <tee/entry_fast.h>
 #include <optee_msg.h>
 #include <sm/optee_smc.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/tee_l2cc_mutex.h>
 #include <kernel/virtualization.h>
 #include <kernel/misc.h>
@@ -132,7 +132,7 @@ static void tee_entry_enable_shm_cache(struct thread_smc_args *args)
 static void tee_entry_boot_secondary(struct thread_smc_args *args)
 {
 #if defined(CFG_BOOT_SECONDARY_REQUEST)
-	if (!generic_boot_core_release(args->a1, (paddr_t)(args->a3)))
+	if (!boot_core_release(args->a1, (paddr_t)(args->a3)))
 		args->a0 = OPTEE_SMC_RETURN_OK;
 	else
 		args->a0 = OPTEE_SMC_RETURN_EBADCMD;
diff --git a/core/drivers/crypto/caam/hal/common/hal_cfg.c b/core/drivers/crypto/caam/hal/common/hal_cfg.c
index d8dedcfe..17514dc0 100644
--- a/core/drivers/crypto/caam/hal/common/hal_cfg.c
+++ b/core/drivers/crypto/caam/hal/common/hal_cfg.c
@@ -9,7 +9,7 @@
 #include <caam_hal_ctrl.h>
 #include <caam_hal_jr.h>
 #include <caam_jr.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <mm/core_memprot.h>
 #include <registers/jr_regs.h>
 
diff --git a/core/drivers/imx_wdog.c b/core/drivers/imx_wdog.c
index 8e9bde44..79152210 100644
--- a/core/drivers/imx_wdog.c
+++ b/core/drivers/imx_wdog.c
@@ -32,7 +32,7 @@
 #include <io.h>
 #include <keep.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <libfdt.h>
 #include <mm/core_memprot.h>
diff --git a/core/drivers/stm32_bsec.c b/core/drivers/stm32_bsec.c
index 546ba917..6c143bb1 100644
--- a/core/drivers/stm32_bsec.c
+++ b/core/drivers/stm32_bsec.c
@@ -9,7 +9,7 @@
 #include <io.h>
 #include <kernel/delay.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/spinlock.h>
 #include <libfdt.h>
 #include <limits.h>
diff --git a/core/drivers/stm32_etzpc.c b/core/drivers/stm32_etzpc.c
index 4a2cb251..05f981c7 100644
--- a/core/drivers/stm32_etzpc.c
+++ b/core/drivers/stm32_etzpc.c
@@ -21,7 +21,7 @@
 #include <io.h>
 #include <keep.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm.h>
 #include <libfdt.h>
diff --git a/core/drivers/stm32_gpio.c b/core/drivers/stm32_gpio.c
index 09340725..cc919caf 100644
--- a/core/drivers/stm32_gpio.c
+++ b/core/drivers/stm32_gpio.c
@@ -10,7 +10,7 @@
 #include <drivers/stm32_gpio.h>
 #include <io.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <kernel/spinlock.h>
 #include <libfdt.h>
diff --git a/core/drivers/stm32_i2c.c b/core/drivers/stm32_i2c.c
index efd5ade0..790a5cab 100644
--- a/core/drivers/stm32_i2c.c
+++ b/core/drivers/stm32_i2c.c
@@ -14,7 +14,7 @@
 #include <io.h>
 #include <kernel/delay.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <libfdt.h>
 #include <stdbool.h>
diff --git a/core/drivers/stm32_rng.c b/core/drivers/stm32_rng.c
index 1f7b374a..d55f28f1 100644
--- a/core/drivers/stm32_rng.c
+++ b/core/drivers/stm32_rng.c
@@ -8,7 +8,7 @@
 #include <io.h>
 #include <kernel/delay.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <libfdt.h>
 #include <mm/core_memprot.h>
diff --git a/core/kernel/console.c b/core/kernel/console.c
index 44a97679..568c26c2 100644
--- a/core/kernel/console.c
+++ b/core/kernel/console.c
@@ -7,7 +7,7 @@
 #include <console.h>
 #include <drivers/serial.h>
 #include <kernel/dt.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <libfdt.h>
 #include <stdlib.h>
diff --git a/core/mm/fobj.c b/core/mm/fobj.c
index 1315a14b..0c16afeb 100644
--- a/core/mm/fobj.c
+++ b/core/mm/fobj.c
@@ -5,7 +5,7 @@
 
 #include <crypto/crypto.h>
 #include <crypto/internal_aes-gcm.h>
-#include <kernel/generic_boot.h>
+#include <kernel/boot.h>
 #include <kernel/panic.h>
 #include <mm/core_memprot.h>
 #include <mm/core_mmu.h>