The DISABLE_ALL_EXECPTIONS define has a typo; fix all occurrences using the
following command:
find '(' -type d -name .git -prune ')' -o -type f -print |\
xargs sed -i 's/DISABLE_ALL_EXECPTIONS/DISABLE_ALL_EXCEPTIONS/g'
This can be verified by pre-processing, for example with the following
commands:
make libretech-cc_v2_defconfig
make spl/arch/arm/mach-meson/spl.i spl/common/spl/spl_atf.i
(Adjust as needed for cross-compilation.)
Signed-off-by: Vincent Stehlé <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ilias Apalodimas <[email protected]>
Cc: Neil Armstrong <[email protected]>
---
arch/arm/mach-meson/spl.c | 2 +-
common/spl/spl_atf.c | 8 ++++----
include/atf_common.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-meson/spl.c b/arch/arm/mach-meson/spl.c
index 28a63f39d36..73445064e4d 100644
--- a/arch/arm/mach-meson/spl.c
+++ b/arch/arm/mach-meson/spl.c
@@ -84,7 +84,7 @@ void board_init_f(ulong dummy)
SET_PARAM_HEAD(&spl_ep_info, ATF_PARAM_BL31, ATF_VERSION_1, 0);
spl_ep_info.pc = CONFIG_SPL_TEXT_BASE;
- spl_ep_info.spsr = SPSR_64(MODE_EL3, MODE_SP_ELX,
DISABLE_ALL_EXECPTIONS);
+ spl_ep_info.spsr = SPSR_64(MODE_EL3, MODE_SP_ELX,
DISABLE_ALL_EXCEPTIONS);
regs.regs[0] = 0xc0000000;
regs.regs[1] = (unsigned long)&spl_ep_info;
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 17acd3665df..cb0604ce034 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -75,7 +75,7 @@ struct bl31_params *bl2_plat_get_bl31_params_default(ulong
bl32_entry,
bl32_ep_info->args.arg3 = fdt_addr;
bl32_ep_info->pc = bl32_entry ? bl32_entry : 0;
bl32_ep_info->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,
- DISABLE_ALL_EXECPTIONS);
+ DISABLE_ALL_EXCEPTIONS);
bl2_to_bl31_params->bl32_image_info = &bl31_params_mem.bl32_image_info;
SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info,
@@ -91,7 +91,7 @@ struct bl31_params *bl2_plat_get_bl31_params_default(ulong
bl32_entry,
bl33_ep_info->args.arg0 = 0xffff & read_mpidr();
bl33_ep_info->pc = bl33_entry;
bl33_ep_info->spsr = SPSR_64(MODE_EL2, MODE_SP_ELX,
- DISABLE_ALL_EXECPTIONS);
+ DISABLE_ALL_EXCEPTIONS);
bl2_to_bl31_params->bl33_image_info = &bl31_params_mem.bl33_image_info;
SET_PARAM_HEAD(bl2_to_bl31_params->bl33_image_info,
@@ -149,7 +149,7 @@ struct bl_params *bl2_plat_get_bl31_params_v2_default(ulong
bl32_entry,
bl_params_node->ep_info->args.arg3 = fdt_addr;
bl_params_node->ep_info->pc = bl32_entry ? bl32_entry : 0;
bl_params_node->ep_info->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,
- DISABLE_ALL_EXECPTIONS);
+ DISABLE_ALL_EXCEPTIONS);
SET_PARAM_HEAD(bl_params_node->image_info, ATF_PARAM_IMAGE_BINARY,
ATF_VERSION_2, 0);
@@ -166,7 +166,7 @@ struct bl_params *bl2_plat_get_bl31_params_v2_default(ulong
bl32_entry,
bl_params_node->ep_info->args.arg0 = 0xffff & read_mpidr();
bl_params_node->ep_info->pc = bl33_entry;
bl_params_node->ep_info->spsr = SPSR_64(MODE_EL2, MODE_SP_ELX,
- DISABLE_ALL_EXECPTIONS);
+ DISABLE_ALL_EXCEPTIONS);
SET_PARAM_HEAD(bl_params_node->image_info, ATF_PARAM_IMAGE_BINARY,
ATF_VERSION_2, 0);
diff --git a/include/atf_common.h b/include/atf_common.h
index 03cfcc69cd7..9ef1ef186e1 100644
--- a/include/atf_common.h
+++ b/include/atf_common.h
@@ -69,7 +69,7 @@
#define DAIF_IRQ_BIT (1<<1)
#define DAIF_ABT_BIT (1<<2)
#define DAIF_DBG_BIT (1<<3)
-#define DISABLE_ALL_EXECPTIONS \
+#define DISABLE_ALL_EXCEPTIONS \
(DAIF_FIQ_BIT | DAIF_IRQ_BIT | DAIF_ABT_BIT | DAIF_DBG_BIT)
#ifndef __ASSEMBLY__
---
base-commit: 3f19667468fb93bcb5702d23aa057b72639e3ac8
change-id: 20260901-typo-465ee352485c
Best regards,
--
Vincent.
