diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-01 18:42:24 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-02 00:18:54 +0900 |
| commit | 0fc50a86c1faeb8ffd42d6c1a121243595fb9143 (patch) | |
| tree | ca230fb4f3c64ab1b9236ecd8da6026a6cb541de /plat/common/aarch32 | |
| parent | c43d68510e309b8e8d152c158ec46450f14d72a6 (diff) | |
| download | platform_external_arm-trusted-firmware-0fc50a86c1faeb8ffd42d6c1a121243595fb9143.tar.gz platform_external_arm-trusted-firmware-0fc50a86c1faeb8ffd42d6c1a121243595fb9143.tar.bz2 platform_external_arm-trusted-firmware-0fc50a86c1faeb8ffd42d6c1a121243595fb9143.zip | |
plat/common: move arch-agnostic fallback functions to C file
When we add a new callback, we need to duplicate fallbacks among
plat/common/{aarch32,aarch64}/platform_helpers.S This is tedious.
I created a new C file, then moved 3 functions:
plat_error_handler
bl2_plat_preload_setup
plat_try_next_boot_source
They are called from C, so I do not see a good reason to implement
them in assembly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat/common/aarch32')
| -rw-r--r-- | plat/common/aarch32/platform_helpers.S | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/plat/common/aarch32/platform_helpers.S b/plat/common/aarch32/platform_helpers.S index 0a0e92714..d61853942 100644 --- a/plat/common/aarch32/platform_helpers.S +++ b/plat/common/aarch32/platform_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,10 +15,7 @@ .weak plat_disable_acp .weak bl1_plat_prepare_exit .weak platform_mem_init - .weak plat_error_handler .weak plat_panic_handler - .weak bl2_plat_preload_setup - .weak plat_try_next_boot_source /* ----------------------------------------------------- * Placeholder function which should be redefined by @@ -95,16 +92,6 @@ func bl1_plat_prepare_exit endfunc bl1_plat_prepare_exit /* ----------------------------------------------------- - * void plat_error_handler(int err) __dead2; - * Endless loop by default. - * ----------------------------------------------------- - */ -func plat_error_handler - wfi - b plat_error_handler -endfunc plat_error_handler - - /* ----------------------------------------------------- * void plat_panic_handler(void) __dead2; * Endless loop by default. * ----------------------------------------------------- @@ -112,23 +99,3 @@ endfunc plat_error_handler func plat_panic_handler b plat_panic_handler endfunc plat_panic_handler - - - /* ----------------------------------------------------- - * Placeholder function which should be redefined by - * each platfrom. - * ----------------------------------------------------- - */ -func bl2_plat_preload_setup - bx lr -endfunc bl2_plat_preload_setup - - /* ----------------------------------------------------- - * Placeholder function which should be redefined by - * each platfrom. - * ----------------------------------------------------- - */ -func plat_try_next_boot_source - mov r0, #0 - bx lr -endfunc plat_try_next_boot_source |