Rename arm32 architecture to arm

Renames arm32 directories to arm.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU)
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU platform)

133 files changed, 6 insertions, 6 deletions

diff --git a/core/arch/arm32/arm32.mk b/core/arch/arm/arm.mk
index 140b7323..140b7323 100644
--- a/core/arch/arm32/arm32.mk
+++ b/core/arch/arm/arm.mk
diff --git a/core/arch/arm32/include/arm.h b/core/arch/arm/include/arm.h
index 895c69f5..895c69f5 100644
--- a/core/arch/arm32/include/arm.h
+++ b/core/arch/arm/include/arm.h
diff --git a/core/arch/arm32/include/arm32.h b/core/arch/arm/include/arm32.h
index cd17fd4c..cd17fd4c 100644
--- a/core/arch/arm32/include/arm32.h
+++ b/core/arch/arm/include/arm32.h
diff --git a/core/arch/arm32/include/arm32_macros.S b/core/arch/arm/include/arm32_macros.S
index 20a5991b..20a5991b 100644
--- a/core/arch/arm32/include/arm32_macros.S
+++ b/core/arch/arm/include/arm32_macros.S
diff --git a/core/arch/arm32/include/kernel/kta_types.h b/core/arch/arm/include/kernel/kta_types.h
index baa3a1a8..baa3a1a8 100644
--- a/core/arch/arm32/include/kernel/kta_types.h
+++ b/core/arch/arm/include/kernel/kta_types.h
diff --git a/core/arch/arm32/include/kernel/misc.h b/core/arch/arm/include/kernel/misc.h
index 3d14789e..3d14789e 100644
--- a/core/arch/arm32/include/kernel/misc.h
+++ b/core/arch/arm/include/kernel/misc.h
diff --git a/core/arch/arm32/include/kernel/mutex.h b/core/arch/arm/include/kernel/mutex.h
index 97cdd9fe..97cdd9fe 100644
--- a/core/arch/arm32/include/kernel/mutex.h
+++ b/core/arch/arm/include/kernel/mutex.h
diff --git a/core/arch/arm32/include/kernel/tee_l2cc_mutex.h b/core/arch/arm/include/kernel/tee_l2cc_mutex.h
index ba9a9b21..ba9a9b21 100644
--- a/core/arch/arm32/include/kernel/tee_l2cc_mutex.h
+++ b/core/arch/arm/include/kernel/tee_l2cc_mutex.h
diff --git a/core/arch/arm32/include/kernel/thread.h b/core/arch/arm/include/kernel/thread.h
index 8aa33ac0..8aa33ac0 100644
--- a/core/arch/arm32/include/kernel/thread.h
+++ b/core/arch/arm/include/kernel/thread.h
diff --git a/core/arch/arm32/include/kernel/thread_defs.h b/core/arch/arm/include/kernel/thread_defs.h
index bdf4b9f9..bdf4b9f9 100644
--- a/core/arch/arm32/include/kernel/thread_defs.h
+++ b/core/arch/arm/include/kernel/thread_defs.h
diff --git a/core/arch/arm32/include/kernel/time_source.h b/core/arch/arm/include/kernel/time_source.h
index 554bb7e6..554bb7e6 100644
--- a/core/arch/arm32/include/kernel/time_source.h
+++ b/core/arch/arm/include/kernel/time_source.h
diff --git a/core/arch/arm32/include/kernel/tz_proc.h b/core/arch/arm/include/kernel/tz_proc.h
index f87bd65f..f87bd65f 100644
--- a/core/arch/arm32/include/kernel/tz_proc.h
+++ b/core/arch/arm/include/kernel/tz_proc.h
diff --git a/core/arch/arm32/include/kernel/tz_proc_def.h b/core/arch/arm/include/kernel/tz_proc_def.h
index f5915e47..f5915e47 100644
--- a/core/arch/arm32/include/kernel/tz_proc_def.h
+++ b/core/arch/arm/include/kernel/tz_proc_def.h
diff --git a/core/arch/arm32/include/kernel/tz_ssvce.h b/core/arch/arm/include/kernel/tz_ssvce.h
index a48e79f3..a48e79f3 100644
--- a/core/arch/arm32/include/kernel/tz_ssvce.h
+++ b/core/arch/arm/include/kernel/tz_ssvce.h
diff --git a/core/arch/arm32/include/kernel/tz_ssvce_def.h b/core/arch/arm/include/kernel/tz_ssvce_def.h
index 99378997..99378997 100644
--- a/core/arch/arm32/include/kernel/tz_ssvce_def.h
+++ b/core/arch/arm/include/kernel/tz_ssvce_def.h
diff --git a/core/arch/arm32/include/kernel/tz_ssvce_pl310.h b/core/arch/arm/include/kernel/tz_ssvce_pl310.h
index 4a0395bf..4a0395bf 100644
--- a/core/arch/arm32/include/kernel/tz_ssvce_pl310.h
+++ b/core/arch/arm/include/kernel/tz_ssvce_pl310.h
diff --git a/core/arch/arm32/include/kernel/vfp.h b/core/arch/arm/include/kernel/vfp.h
index 00b9306d..00b9306d 100644
--- a/core/arch/arm32/include/kernel/vfp.h
+++ b/core/arch/arm/include/kernel/vfp.h
diff --git a/core/arch/arm32/include/mm/core_memprot.h b/core/arch/arm/include/mm/core_memprot.h
index b18cf3cc..b18cf3cc 100644
--- a/core/arch/arm32/include/mm/core_memprot.h
+++ b/core/arch/arm/include/mm/core_memprot.h
diff --git a/core/arch/arm32/include/mm/core_mmu.h b/core/arch/arm/include/mm/core_mmu.h
index a43ca87d..a43ca87d 100644
--- a/core/arch/arm32/include/mm/core_mmu.h
+++ b/core/arch/arm/include/mm/core_mmu.h
diff --git a/core/arch/arm32/include/mm/tee_mm_def.h b/core/arch/arm/include/mm/tee_mm_def.h
index 16945c5f..16945c5f 100644
--- a/core/arch/arm32/include/mm/tee_mm_def.h
+++ b/core/arch/arm/include/mm/tee_mm_def.h
diff --git a/core/arch/arm32/include/mm/tee_mmu_defs.h b/core/arch/arm/include/mm/tee_mmu_defs.h
index 7d6645fb..7d6645fb 100644
--- a/core/arch/arm32/include/mm/tee_mmu_defs.h
+++ b/core/arch/arm/include/mm/tee_mmu_defs.h
diff --git a/core/arch/arm32/include/mm/tee_pager.h b/core/arch/arm/include/mm/tee_pager.h
index 78ce1b09..78ce1b09 100644
--- a/core/arch/arm32/include/mm/tee_pager.h
+++ b/core/arch/arm/include/mm/tee_pager.h
diff --git a/core/arch/arm32/include/sm/sm.h b/core/arch/arm/include/sm/sm.h
index d1838a83..d1838a83 100644
--- a/core/arch/arm32/include/sm/sm.h
+++ b/core/arch/arm/include/sm/sm.h
diff --git a/core/arch/arm32/include/sm/sm_defs.h b/core/arch/arm/include/sm/sm_defs.h
index 4d37e6e5..4d37e6e5 100644
--- a/core/arch/arm32/include/sm/sm_defs.h
+++ b/core/arch/arm/include/sm/sm_defs.h
diff --git a/core/arch/arm32/include/sm/tee_mon.h b/core/arch/arm/include/sm/tee_mon.h
index 1db7840e..1db7840e 100644
--- a/core/arch/arm32/include/sm/tee_mon.h
+++ b/core/arch/arm/include/sm/tee_mon.h
diff --git a/core/arch/arm32/include/sm/teesmc.h b/core/arch/arm/include/sm/teesmc.h
index c1e13b82..c1e13b82 100644
--- a/core/arch/arm32/include/sm/teesmc.h
+++ b/core/arch/arm/include/sm/teesmc.h
diff --git a/core/arch/arm32/include/sm/teesmc_optee.h b/core/arch/arm/include/sm/teesmc_optee.h
index 403f1097..403f1097 100644
--- a/core/arch/arm32/include/sm/teesmc_optee.h
+++ b/core/arch/arm/include/sm/teesmc_optee.h
diff --git a/core/arch/arm32/include/sm/teesmc_opteed.h b/core/arch/arm/include/sm/teesmc_opteed.h
index c6e25e25..c6e25e25 100644
--- a/core/arch/arm32/include/sm/teesmc_opteed.h
+++ b/core/arch/arm/include/sm/teesmc_opteed.h
diff --git a/core/arch/arm32/include/sm/teesmc_opteed_macros.h b/core/arch/arm/include/sm/teesmc_opteed_macros.h
index bbdca22f..bbdca22f 100644
--- a/core/arch/arm32/include/sm/teesmc_opteed_macros.h
+++ b/core/arch/arm/include/sm/teesmc_opteed_macros.h
diff --git a/core/arch/arm32/include/tee/arch_svc.h b/core/arch/arm/include/tee/arch_svc.h
index 01e3f4d1..01e3f4d1 100644
--- a/core/arch/arm32/include/tee/arch_svc.h
+++ b/core/arch/arm/include/tee/arch_svc.h
diff --git a/core/arch/arm32/include/tee/entry.h b/core/arch/arm/include/tee/entry.h
index 09764321..09764321 100644
--- a/core/arch/arm32/include/tee/entry.h
+++ b/core/arch/arm/include/tee/entry.h
diff --git a/core/arch/arm32/kernel/misc_a32.S b/core/arch/arm/kernel/misc_a32.S
index a0405520..a0405520 100644
--- a/core/arch/arm32/kernel/misc_a32.S
+++ b/core/arch/arm/kernel/misc_a32.S
diff --git a/core/arch/arm32/kernel/mutex.c b/core/arch/arm/kernel/mutex.c
index 214f7018..214f7018 100644
--- a/core/arch/arm32/kernel/mutex.c
+++ b/core/arch/arm/kernel/mutex.c
diff --git a/core/arch/arm32/kernel/proc_a32.S b/core/arch/arm/kernel/proc_a32.S
index d3436ebe..d3436ebe 100644
--- a/core/arch/arm32/kernel/proc_a32.S
+++ b/core/arch/arm/kernel/proc_a32.S
diff --git a/core/arch/arm32/kernel/ssvce_a32.S b/core/arch/arm/kernel/ssvce_a32.S
index 496d9c8a..496d9c8a 100644
--- a/core/arch/arm32/kernel/ssvce_a32.S
+++ b/core/arch/arm/kernel/ssvce_a32.S
diff --git a/core/arch/arm32/kernel/sub.mk b/core/arch/arm/kernel/sub.mk
index 94f7a551..94f7a551 100644
--- a/core/arch/arm32/kernel/sub.mk
+++ b/core/arch/arm/kernel/sub.mk
diff --git a/core/arch/arm32/kernel/tee_l2cc_mutex.c b/core/arch/arm/kernel/tee_l2cc_mutex.c
index c71a6514..c71a6514 100644
--- a/core/arch/arm32/kernel/tee_l2cc_mutex.c
+++ b/core/arch/arm/kernel/tee_l2cc_mutex.c
diff --git a/core/arch/arm32/kernel/tee_ta_manager.c b/core/arch/arm/kernel/tee_ta_manager.c
index 401ce575..401ce575 100644
--- a/core/arch/arm32/kernel/tee_ta_manager.c
+++ b/core/arch/arm/kernel/tee_ta_manager.c
diff --git a/core/arch/arm32/kernel/tee_time.c b/core/arch/arm/kernel/tee_time.c
index e343bdab..e343bdab 100644
--- a/core/arch/arm32/kernel/tee_time.c
+++ b/core/arch/arm/kernel/tee_time.c
diff --git a/core/arch/arm32/kernel/tee_time_arm_cntpct.c b/core/arch/arm/kernel/tee_time_arm_cntpct.c
index d4dc7a68..d4dc7a68 100644
--- a/core/arch/arm32/kernel/tee_time_arm_cntpct.c
+++ b/core/arch/arm/kernel/tee_time_arm_cntpct.c
diff --git a/core/arch/arm32/kernel/tee_time_ree.c b/core/arch/arm/kernel/tee_time_ree.c
index 7e76153d..7e76153d 100644
--- a/core/arch/arm32/kernel/tee_time_ree.c
+++ b/core/arch/arm/kernel/tee_time_ree.c
diff --git a/core/arch/arm32/kernel/tee_time_rtt.c b/core/arch/arm/kernel/tee_time_rtt.c
index ac8188c3..ac8188c3 100644
--- a/core/arch/arm32/kernel/tee_time_rtt.c
+++ b/core/arch/arm/kernel/tee_time_rtt.c
diff --git a/core/arch/arm32/kernel/tee_time_unpg.c b/core/arch/arm/kernel/tee_time_unpg.c
index 35532975..35532975 100644
--- a/core/arch/arm32/kernel/tee_time_unpg.c
+++ b/core/arch/arm/kernel/tee_time_unpg.c
diff --git a/core/arch/arm32/kernel/thread.c b/core/arch/arm/kernel/thread.c
index 6b3312cf..6b3312cf 100644
--- a/core/arch/arm32/kernel/thread.c
+++ b/core/arch/arm/kernel/thread.c
diff --git a/core/arch/arm32/kernel/thread_a32.S b/core/arch/arm/kernel/thread_a32.S
index 4373a796..4373a796 100644
--- a/core/arch/arm32/kernel/thread_a32.S
+++ b/core/arch/arm/kernel/thread_a32.S
diff --git a/core/arch/arm32/kernel/thread_private.h b/core/arch/arm/kernel/thread_private.h
index 83c879fc..83c879fc 100644
--- a/core/arch/arm32/kernel/thread_private.h
+++ b/core/arch/arm/kernel/thread_private.h
diff --git a/core/arch/arm32/kernel/trace_ext.c b/core/arch/arm/kernel/trace_ext.c
index 51268c62..51268c62 100644
--- a/core/arch/arm32/kernel/trace_ext.c
+++ b/core/arch/arm/kernel/trace_ext.c
diff --git a/core/arch/arm32/kernel/tz_ssvce_pl310_a32.S b/core/arch/arm/kernel/tz_ssvce_pl310_a32.S
index 874af4d5..874af4d5 100644
--- a/core/arch/arm32/kernel/tz_ssvce_pl310_a32.S
+++ b/core/arch/arm/kernel/tz_ssvce_pl310_a32.S
diff --git a/core/arch/arm32/kernel/vfp.c b/core/arch/arm/kernel/vfp.c
index 888f0a42..888f0a42 100644
--- a/core/arch/arm32/kernel/vfp.c
+++ b/core/arch/arm/kernel/vfp.c
diff --git a/core/arch/arm32/kernel/vfp_a32.S b/core/arch/arm/kernel/vfp_a32.S
index db8cd123..db8cd123 100644
--- a/core/arch/arm32/kernel/vfp_a32.S
+++ b/core/arch/arm/kernel/vfp_a32.S
diff --git a/core/arch/arm32/kernel/vfp_private.h b/core/arch/arm/kernel/vfp_private.h
index da733a04..da733a04 100644
--- a/core/arch/arm32/kernel/vfp_private.h
+++ b/core/arch/arm/kernel/vfp_private.h
diff --git a/core/arch/arm32/mm/core_mmu.c b/core/arch/arm/mm/core_mmu.c
index 3612ea73..3612ea73 100644
--- a/core/arch/arm32/mm/core_mmu.c
+++ b/core/arch/arm/mm/core_mmu.c
diff --git a/core/arch/arm32/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c
index 276c271c..276c271c 100644
--- a/core/arch/arm32/mm/core_mmu_lpae.c
+++ b/core/arch/arm/mm/core_mmu_lpae.c
diff --git a/core/arch/arm32/mm/core_mmu_private.h b/core/arch/arm/mm/core_mmu_private.h
index 777c8b07..777c8b07 100644
--- a/core/arch/arm32/mm/core_mmu_private.h
+++ b/core/arch/arm/mm/core_mmu_private.h
diff --git a/core/arch/arm32/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c
index ef9582cb..ef9582cb 100644
--- a/core/arch/arm32/mm/core_mmu_v7.c
+++ b/core/arch/arm/mm/core_mmu_v7.c
diff --git a/core/arch/arm32/mm/sub.mk b/core/arch/arm/mm/sub.mk
index 5723124e..5723124e 100644
--- a/core/arch/arm32/mm/sub.mk
+++ b/core/arch/arm/mm/sub.mk
diff --git a/core/arch/arm32/mm/tee_mm.c b/core/arch/arm/mm/tee_mm.c
index 323e4256..323e4256 100644
--- a/core/arch/arm32/mm/tee_mm.c
+++ b/core/arch/arm/mm/tee_mm.c
diff --git a/core/arch/arm32/mm/tee_mm_unpg.c b/core/arch/arm/mm/tee_mm_unpg.c
index 91f4416a..91f4416a 100644
--- a/core/arch/arm32/mm/tee_mm_unpg.c
+++ b/core/arch/arm/mm/tee_mm_unpg.c
diff --git a/core/arch/arm32/mm/tee_mmu.c b/core/arch/arm/mm/tee_mmu.c
index 96f5e141..96f5e141 100644
--- a/core/arch/arm32/mm/tee_mmu.c
+++ b/core/arch/arm/mm/tee_mmu.c
diff --git a/core/arch/arm32/mm/tee_pager.c b/core/arch/arm/mm/tee_pager.c
index 4fc2965f..4fc2965f 100644
--- a/core/arch/arm32/mm/tee_pager.c
+++ b/core/arch/arm/mm/tee_pager.c
diff --git a/core/arch/arm32/plat-stm/.gitignore b/core/arch/arm/plat-stm/.gitignore
index 49b7bb9e..49b7bb9e 100644
--- a/core/arch/arm32/plat-stm/.gitignore
+++ b/core/arch/arm/plat-stm/.gitignore
diff --git a/core/arch/arm32/plat-stm/asc.S b/core/arch/arm/plat-stm/asc.S
index af10b4ce..af10b4ce 100644
--- a/core/arch/arm32/plat-stm/asc.S
+++ b/core/arch/arm/plat-stm/asc.S
diff --git a/core/arch/arm32/plat-stm/asc.h b/core/arch/arm/plat-stm/asc.h
index f942c661..f942c661 100644
--- a/core/arch/arm32/plat-stm/asc.h
+++ b/core/arch/arm/plat-stm/asc.h
diff --git a/core/arch/arm32/plat-stm/cache_maintenance.c b/core/arch/arm/plat-stm/cache_maintenance.c
index 54f037a2..54f037a2 100644
--- a/core/arch/arm32/plat-stm/cache_maintenance.c
+++ b/core/arch/arm/plat-stm/cache_maintenance.c
diff --git a/core/arch/arm32/plat-stm/conf.mk b/core/arch/arm/plat-stm/conf.mk
index fea9393e..fea9393e 100644
--- a/core/arch/arm32/plat-stm/conf.mk
+++ b/core/arch/arm/plat-stm/conf.mk
diff --git a/core/arch/arm32/plat-stm/core_bootcfg.c b/core/arch/arm/plat-stm/core_bootcfg.c
index 2904a017..2904a017 100644
--- a/core/arch/arm32/plat-stm/core_bootcfg.c
+++ b/core/arch/arm/plat-stm/core_bootcfg.c
diff --git a/core/arch/arm32/plat-stm/core_chip_cannes.c b/core/arch/arm/plat-stm/core_chip_cannes.c
index 84d079f6..84d079f6 100644
--- a/core/arch/arm32/plat-stm/core_chip_cannes.c
+++ b/core/arch/arm/plat-stm/core_chip_cannes.c
diff --git a/core/arch/arm32/plat-stm/core_chip_orly2.c b/core/arch/arm/plat-stm/core_chip_orly2.c
index 52850ebd..52850ebd 100644
--- a/core/arch/arm32/plat-stm/core_chip_orly2.c
+++ b/core/arch/arm/plat-stm/core_chip_orly2.c
diff --git a/core/arch/arm32/plat-stm/link.mk b/core/arch/arm/plat-stm/link.mk
index 4512dd0c..4512dd0c 100644
--- a/core/arch/arm32/plat-stm/link.mk
+++ b/core/arch/arm/plat-stm/link.mk
diff --git a/core/arch/arm32/plat-stm/main.c b/core/arch/arm/plat-stm/main.c
index 4052e6ac..4052e6ac 100644
--- a/core/arch/arm32/plat-stm/main.c
+++ b/core/arch/arm/plat-stm/main.c
diff --git a/core/arch/arm32/plat-stm/platform_config.h b/core/arch/arm/plat-stm/platform_config.h
index d54e7a42..d54e7a42 100644
--- a/core/arch/arm32/plat-stm/platform_config.h
+++ b/core/arch/arm/plat-stm/platform_config.h
diff --git a/core/arch/arm32/plat-stm/platform_flags.mk b/core/arch/arm/plat-stm/platform_flags.mk
index ceae557f..ceae557f 100644
--- a/core/arch/arm32/plat-stm/platform_flags.mk
+++ b/core/arch/arm/plat-stm/platform_flags.mk
diff --git a/core/arch/arm32/plat-stm/rng_support.c b/core/arch/arm/plat-stm/rng_support.c
index 6647e959..6647e959 100644
--- a/core/arch/arm32/plat-stm/rng_support.c
+++ b/core/arch/arm/plat-stm/rng_support.c
diff --git a/core/arch/arm32/plat-stm/sub.mk b/core/arch/arm/plat-stm/sub.mk
index f4afaa3c..f4afaa3c 100644
--- a/core/arch/arm32/plat-stm/sub.mk
+++ b/core/arch/arm/plat-stm/sub.mk
diff --git a/core/arch/arm32/plat-stm/system_config.in b/core/arch/arm/plat-stm/system_config.in
index 192e3f6c..192e3f6c 100644
--- a/core/arch/arm32/plat-stm/system_config.in
+++ b/core/arch/arm/plat-stm/system_config.in
diff --git a/core/arch/arm32/plat-stm/tee_common_otp.c b/core/arch/arm/plat-stm/tee_common_otp.c
index d44c4b43..d44c4b43 100644
--- a/core/arch/arm32/plat-stm/tee_common_otp.c
+++ b/core/arch/arm/plat-stm/tee_common_otp.c
diff --git a/core/arch/arm32/plat-stm/tz-template.lds b/core/arch/arm/plat-stm/tz-template.lds
index bd573571..bd573571 100644
--- a/core/arch/arm32/plat-stm/tz-template.lds
+++ b/core/arch/arm/plat-stm/tz-template.lds
diff --git a/core/arch/arm32/plat-stm/tz_a9init.S b/core/arch/arm/plat-stm/tz_a9init.S
index c6199ab7..c6199ab7 100644
--- a/core/arch/arm32/plat-stm/tz_a9init.S
+++ b/core/arch/arm/plat-stm/tz_a9init.S
diff --git a/core/arch/arm32/plat-stm/tz_sinit.S b/core/arch/arm/plat-stm/tz_sinit.S
index 9f14ea0c..9f14ea0c 100644
--- a/core/arch/arm32/plat-stm/tz_sinit.S
+++ b/core/arch/arm/plat-stm/tz_sinit.S
diff --git a/core/arch/arm32/plat-sunxi/conf.mk b/core/arch/arm/plat-sunxi/conf.mk
index 4429307d..4429307d 100644
--- a/core/arch/arm32/plat-sunxi/conf.mk
+++ b/core/arch/arm/plat-sunxi/conf.mk
diff --git a/core/arch/arm32/plat-sunxi/console.c b/core/arch/arm/plat-sunxi/console.c
index 990e6a51..990e6a51 100644
--- a/core/arch/arm32/plat-sunxi/console.c
+++ b/core/arch/arm/plat-sunxi/console.c
diff --git a/core/arch/arm32/plat-sunxi/core_bootcfg.c b/core/arch/arm/plat-sunxi/core_bootcfg.c
index 594be35b..594be35b 100644
--- a/core/arch/arm32/plat-sunxi/core_bootcfg.c
+++ b/core/arch/arm/plat-sunxi/core_bootcfg.c
diff --git a/core/arch/arm32/plat-sunxi/core_chip.c b/core/arch/arm/plat-sunxi/core_chip.c
index 0a54f767..0a54f767 100644
--- a/core/arch/arm32/plat-sunxi/core_chip.c
+++ b/core/arch/arm/plat-sunxi/core_chip.c
diff --git a/core/arch/arm32/plat-sunxi/entry.S b/core/arch/arm/plat-sunxi/entry.S
index 79878d95..79878d95 100644
--- a/core/arch/arm32/plat-sunxi/entry.S
+++ b/core/arch/arm/plat-sunxi/entry.S
diff --git a/core/arch/arm32/plat-sunxi/head.c b/core/arch/arm/plat-sunxi/head.c
index 838dbf44..838dbf44 100644
--- a/core/arch/arm32/plat-sunxi/head.c
+++ b/core/arch/arm/plat-sunxi/head.c
diff --git a/core/arch/arm32/plat-sunxi/kern.ld.S b/core/arch/arm/plat-sunxi/kern.ld.S
index d19cef69..d19cef69 100644
--- a/core/arch/arm32/plat-sunxi/kern.ld.S
+++ b/core/arch/arm/plat-sunxi/kern.ld.S
diff --git a/core/arch/arm32/plat-sunxi/link.mk b/core/arch/arm/plat-sunxi/link.mk
index 59406bd5..59406bd5 100644
--- a/core/arch/arm32/plat-sunxi/link.mk
+++ b/core/arch/arm/plat-sunxi/link.mk
diff --git a/core/arch/arm32/plat-sunxi/main.c b/core/arch/arm/plat-sunxi/main.c
index 4eec9d56..4eec9d56 100644
--- a/core/arch/arm32/plat-sunxi/main.c
+++ b/core/arch/arm/plat-sunxi/main.c
diff --git a/core/arch/arm32/plat-sunxi/platform.c b/core/arch/arm/plat-sunxi/platform.c
index 2671f865..2671f865 100644
--- a/core/arch/arm32/plat-sunxi/platform.c
+++ b/core/arch/arm/plat-sunxi/platform.c
diff --git a/core/arch/arm32/plat-sunxi/platform.h b/core/arch/arm/plat-sunxi/platform.h
index 962317f0..962317f0 100644
--- a/core/arch/arm32/plat-sunxi/platform.h
+++ b/core/arch/arm/plat-sunxi/platform.h
diff --git a/core/arch/arm32/plat-sunxi/platform_config.h b/core/arch/arm/plat-sunxi/platform_config.h
index d903d867..d903d867 100644
--- a/core/arch/arm32/plat-sunxi/platform_config.h
+++ b/core/arch/arm/plat-sunxi/platform_config.h
diff --git a/core/arch/arm32/plat-sunxi/platform_flags.mk b/core/arch/arm/plat-sunxi/platform_flags.mk
index d6267f3c..d6267f3c 100644
--- a/core/arch/arm32/plat-sunxi/platform_flags.mk
+++ b/core/arch/arm/plat-sunxi/platform_flags.mk
diff --git a/core/arch/arm32/plat-sunxi/rng_support.c b/core/arch/arm/plat-sunxi/rng_support.c
index 434b1048..434b1048 100644
--- a/core/arch/arm32/plat-sunxi/rng_support.c
+++ b/core/arch/arm/plat-sunxi/rng_support.c
diff --git a/core/arch/arm32/plat-sunxi/smp_boot.S b/core/arch/arm/plat-sunxi/smp_boot.S
index 498d4328..498d4328 100644
--- a/core/arch/arm32/plat-sunxi/smp_boot.S
+++ b/core/arch/arm/plat-sunxi/smp_boot.S
diff --git a/core/arch/arm32/plat-sunxi/smp_fixup.S b/core/arch/arm/plat-sunxi/smp_fixup.S
index 18701cc4..18701cc4 100644
--- a/core/arch/arm32/plat-sunxi/smp_fixup.S
+++ b/core/arch/arm/plat-sunxi/smp_fixup.S
diff --git a/core/arch/arm32/plat-sunxi/sub.mk b/core/arch/arm/plat-sunxi/sub.mk
index b36e4bdb..b36e4bdb 100644
--- a/core/arch/arm32/plat-sunxi/sub.mk
+++ b/core/arch/arm/plat-sunxi/sub.mk
diff --git a/core/arch/arm32/plat-sunxi/tee_common_otp.c b/core/arch/arm/plat-sunxi/tee_common_otp.c
index b281b8ea..b281b8ea 100644
--- a/core/arch/arm32/plat-sunxi/tee_common_otp.c
+++ b/core/arch/arm/plat-sunxi/tee_common_otp.c
diff --git a/core/arch/arm32/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk
index 0b600acd..0b600acd 100644
--- a/core/arch/arm32/plat-vexpress/conf.mk
+++ b/core/arch/arm/plat-vexpress/conf.mk
diff --git a/core/arch/arm32/plat-vexpress/core_bootcfg.c b/core/arch/arm/plat-vexpress/core_bootcfg.c
index e0907e5e..e0907e5e 100644
--- a/core/arch/arm32/plat-vexpress/core_bootcfg.c
+++ b/core/arch/arm/plat-vexpress/core_bootcfg.c
diff --git a/core/arch/arm32/plat-vexpress/core_chip.c b/core/arch/arm/plat-vexpress/core_chip.c
index 30751c11..30751c11 100644
--- a/core/arch/arm32/plat-vexpress/core_chip.c
+++ b/core/arch/arm/plat-vexpress/core_chip.c
diff --git a/core/arch/arm32/plat-vexpress/entry_a32.S b/core/arch/arm/plat-vexpress/entry_a32.S
index fe5383e8..fe5383e8 100644
--- a/core/arch/arm32/plat-vexpress/entry_a32.S
+++ b/core/arch/arm/plat-vexpress/entry_a32.S
diff --git a/core/arch/arm32/plat-vexpress/juno_core_pos_a32.S b/core/arch/arm/plat-vexpress/juno_core_pos_a32.S
index 699d7f51..699d7f51 100644
--- a/core/arch/arm32/plat-vexpress/juno_core_pos_a32.S
+++ b/core/arch/arm/plat-vexpress/juno_core_pos_a32.S
diff --git a/core/arch/arm32/plat-vexpress/kern.ld.S b/core/arch/arm/plat-vexpress/kern.ld.S
index 71ae7555..71ae7555 100644
--- a/core/arch/arm32/plat-vexpress/kern.ld.S
+++ b/core/arch/arm/plat-vexpress/kern.ld.S
diff --git a/core/arch/arm32/plat-vexpress/link.mk b/core/arch/arm/plat-vexpress/link.mk
index 3eb33b6f..d83ea32f 100644
--- a/core/arch/arm32/plat-vexpress/link.mk
+++ b/core/arch/arm/plat-vexpress/link.mk
@@ -52,10 +52,10 @@ $(link-out-dir)/rodata_unpaged.ld.S: $(link-out-dir)/unpaged.o
 	$(q)$(READELFcore) -a -W $< | \
 		${AWK} -f ./scripts/gen_ld_rodata_sects.awk > $@
 
-objs-init-rem += core/arch/arm32/tee/arch_svc.o
-objs-init-rem += core/arch/arm32/tee/arch_svc_asm.o
-objs-init-rem += core/arch/arm32/plat-vexpress/plat_tee_func.o
-objs-init-rem += core/arch/arm32/tee/init.o
+objs-init-rem += core/arch/arm/tee/arch_svc.o
+objs-init-rem += core/arch/arm/tee/arch_svc_asm.o
+objs-init-rem += core/arch/arm/plat-vexpress/plat_tee_func.o
+objs-init-rem += core/arch/arm/tee/init.o
 entries-init += _start
 objs-init := \
 	$(filter-out $(addprefix $(out-dir)/, $(objs-init-rem)), $(objs))
diff --git a/core/arch/arm32/plat-vexpress/main.c b/core/arch/arm/plat-vexpress/main.c
index 53c2ec59..53c2ec59 100644
--- a/core/arch/arm32/plat-vexpress/main.c
+++ b/core/arch/arm/plat-vexpress/main.c
diff --git a/core/arch/arm32/plat-vexpress/plat_tee_func.c b/core/arch/arm/plat-vexpress/plat_tee_func.c
index 0d119e11..0d119e11 100644
--- a/core/arch/arm32/plat-vexpress/plat_tee_func.c
+++ b/core/arch/arm/plat-vexpress/plat_tee_func.c
diff --git a/core/arch/arm32/plat-vexpress/plat_tee_func.h b/core/arch/arm/plat-vexpress/plat_tee_func.h
index 14386c07..14386c07 100644
--- a/core/arch/arm32/plat-vexpress/plat_tee_func.h
+++ b/core/arch/arm/plat-vexpress/plat_tee_func.h
diff --git a/core/arch/arm32/plat-vexpress/platform_config.h b/core/arch/arm/plat-vexpress/platform_config.h
index 9bcb07ec..9bcb07ec 100644
--- a/core/arch/arm32/plat-vexpress/platform_config.h
+++ b/core/arch/arm/plat-vexpress/platform_config.h
diff --git a/core/arch/arm32/plat-vexpress/platform_flags.mk b/core/arch/arm/plat-vexpress/platform_flags.mk
index a94aaff2..a94aaff2 100644
--- a/core/arch/arm32/plat-vexpress/platform_flags.mk
+++ b/core/arch/arm/plat-vexpress/platform_flags.mk
diff --git a/core/arch/arm32/plat-vexpress/pm_debug.h b/core/arch/arm/plat-vexpress/pm_debug.h
index 230483c0..230483c0 100644
--- a/core/arch/arm32/plat-vexpress/pm_debug.h
+++ b/core/arch/arm/plat-vexpress/pm_debug.h
diff --git a/core/arch/arm32/plat-vexpress/sub.mk b/core/arch/arm/plat-vexpress/sub.mk
index d0c193d1..d0c193d1 100644
--- a/core/arch/arm32/plat-vexpress/sub.mk
+++ b/core/arch/arm/plat-vexpress/sub.mk
diff --git a/core/arch/arm32/plat-vexpress/tee_common_otp.c b/core/arch/arm/plat-vexpress/tee_common_otp.c
index d44c4b43..d44c4b43 100644
--- a/core/arch/arm32/plat-vexpress/tee_common_otp.c
+++ b/core/arch/arm/plat-vexpress/tee_common_otp.c
diff --git a/core/arch/arm32/sm/sm.c b/core/arch/arm/sm/sm.c
index 0f15a695..0f15a695 100644
--- a/core/arch/arm32/sm/sm.c
+++ b/core/arch/arm/sm/sm.c
diff --git a/core/arch/arm32/sm/sm_a32.S b/core/arch/arm/sm/sm_a32.S
index d2b1dc4e..d2b1dc4e 100644
--- a/core/arch/arm32/sm/sm_a32.S
+++ b/core/arch/arm/sm/sm_a32.S
diff --git a/core/arch/arm32/sm/sm_private.h b/core/arch/arm/sm/sm_private.h
index 7de84347..7de84347 100644
--- a/core/arch/arm32/sm/sm_private.h
+++ b/core/arch/arm/sm/sm_private.h
diff --git a/core/arch/arm32/sm/sub.mk b/core/arch/arm/sm/sub.mk
index 685739ea..685739ea 100644
--- a/core/arch/arm32/sm/sub.mk
+++ b/core/arch/arm/sm/sub.mk
diff --git a/core/arch/arm32/sta/core_self_tests.c b/core/arch/arm/sta/core_self_tests.c
index 136bb4b7..136bb4b7 100644
--- a/core/arch/arm32/sta/core_self_tests.c
+++ b/core/arch/arm/sta/core_self_tests.c
diff --git a/core/arch/arm32/sta/core_self_tests.h b/core/arch/arm/sta/core_self_tests.h
index ed98669a..ed98669a 100644
--- a/core/arch/arm32/sta/core_self_tests.h
+++ b/core/arch/arm/sta/core_self_tests.h
diff --git a/core/arch/arm32/sta/se_api_self_tests.c b/core/arch/arm/sta/se_api_self_tests.c
index ecd52439..ecd52439 100644
--- a/core/arch/arm32/sta/se_api_self_tests.c
+++ b/core/arch/arm/sta/se_api_self_tests.c
diff --git a/core/arch/arm32/sta/sta_self_tests.c b/core/arch/arm/sta/sta_self_tests.c
index 86a6b9dc..86a6b9dc 100644
--- a/core/arch/arm32/sta/sta_self_tests.c
+++ b/core/arch/arm/sta/sta_self_tests.c
diff --git a/core/arch/arm32/sta/sub.mk b/core/arch/arm/sta/sub.mk
index 7800b4ee..7800b4ee 100644
--- a/core/arch/arm32/sta/sub.mk
+++ b/core/arch/arm/sta/sub.mk
diff --git a/core/arch/arm32/tee/arch_svc.c b/core/arch/arm/tee/arch_svc.c
index 9021e161..9021e161 100644
--- a/core/arch/arm32/tee/arch_svc.c
+++ b/core/arch/arm/tee/arch_svc.c
diff --git a/core/arch/arm32/tee/arch_svc_a32.S b/core/arch/arm/tee/arch_svc_a32.S
index 6a526c8f..6a526c8f 100644
--- a/core/arch/arm32/tee/arch_svc_a32.S
+++ b/core/arch/arm/tee/arch_svc_a32.S
diff --git a/core/arch/arm32/tee/arch_svc_private.h b/core/arch/arm/tee/arch_svc_private.h
index d01ab625..d01ab625 100644
--- a/core/arch/arm32/tee/arch_svc_private.h
+++ b/core/arch/arm/tee/arch_svc_private.h
diff --git a/core/arch/arm32/tee/arch_tee_fs.c b/core/arch/arm/tee/arch_tee_fs.c
index dcdcfb1d..dcdcfb1d 100644
--- a/core/arch/arm32/tee/arch_tee_fs.c
+++ b/core/arch/arm/tee/arch_tee_fs.c
diff --git a/core/arch/arm32/tee/entry.c b/core/arch/arm/tee/entry.c
index eb5c6d20..eb5c6d20 100644
--- a/core/arch/arm32/tee/entry.c
+++ b/core/arch/arm/tee/entry.c
diff --git a/core/arch/arm32/tee/init.c b/core/arch/arm/tee/init.c
index f8517252..f8517252 100644
--- a/core/arch/arm32/tee/init.c
+++ b/core/arch/arm/tee/init.c
diff --git a/core/arch/arm32/tee/sub.mk b/core/arch/arm/tee/sub.mk
index 948ab9cd..948ab9cd 100644
--- a/core/arch/arm32/tee/sub.mk
+++ b/core/arch/arm/tee/sub.mk
diff --git a/core/arch/arm32/tee/tee_rpmb.c b/core/arch/arm/tee/tee_rpmb.c
index 967f40a6..967f40a6 100644
--- a/core/arch/arm32/tee/tee_rpmb.c
+++ b/core/arch/arm/tee/tee_rpmb.c
diff --git a/core/lib/libtomcrypt/src/hashes/sha1_arm32_ce_asm.S b/core/lib/libtomcrypt/src/hashes/sha1_arm32_ce_a32.S
index 32d99d85..32d99d85 100644
--- a/core/lib/libtomcrypt/src/hashes/sha1_arm32_ce_asm.S
+++ b/core/lib/libtomcrypt/src/hashes/sha1_arm32_ce_a32.S
diff --git a/core/lib/libtomcrypt/src/hashes/sha2/sha256_arm32_ce_asm.S b/core/lib/libtomcrypt/src/hashes/sha2/sha256_arm32_ce_a32.S
index 168bf0fb..168bf0fb 100644
--- a/core/lib/libtomcrypt/src/hashes/sha2/sha256_arm32_ce_asm.S
+++ b/core/lib/libtomcrypt/src/hashes/sha2/sha256_arm32_ce_a32.S
diff --git a/core/lib/libtomcrypt/src/hashes/sha2/sub.mk b/core/lib/libtomcrypt/src/hashes/sha2/sub.mk
index 6d7bc7cd..980b5b3e 100644
--- a/core/lib/libtomcrypt/src/hashes/sha2/sub.mk
+++ b/core/lib/libtomcrypt/src/hashes/sha2/sub.mk
@@ -2,7 +2,7 @@ srcs-$(CFG_CRYPTO_SHA224) += sha224.c
 
 ifeq ($(CFG_CRYPTO_SHA256_ARM32_CE),y)
 srcs-y += sha256_arm32_ce.c
-srcs-y += sha256_arm32_ce_asm.S
+srcs-y += sha256_arm32_ce_a32.S
 else
 srcs-$(CFG_CRYPTO_SHA256) += sha256.c
 endif
diff --git a/core/lib/libtomcrypt/src/hashes/sub.mk b/core/lib/libtomcrypt/src/hashes/sub.mk
index 12297073..4f3ef931 100644
--- a/core/lib/libtomcrypt/src/hashes/sub.mk
+++ b/core/lib/libtomcrypt/src/hashes/sub.mk
@@ -2,7 +2,7 @@ srcs-$(CFG_CRYPTO_MD5) += md5.c
 
 ifeq ($(CFG_CRYPTO_SHA1_ARM32_CE),y)
 srcs-y += sha1_arm32_ce.c
-srcs-y += sha1_arm32_ce_asm.S
+srcs-y += sha1_arm32_ce_a32.S
 else
 srcs-$(CFG_CRYPTO_SHA1) += sha1.c
 endif