diff options
| author | danh-arm <dan.handley@arm.com> | 2016-03-16 11:02:28 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-03-16 11:02:28 +0000 |
| commit | 63a6d09a084386f27a240602fd3be9a975ba65df (patch) | |
| tree | 790d7bcce12f8064bfac9cdd149a47d830233b26 /include | |
| parent | 5cc34831bab6f6037efb64547090e5248c50a519 (diff) | |
| parent | 1c3ea103d28760a04e457678bf60725ae761c28f (diff) | |
Merge pull request #550 from antonio-nino-diaz-arm/an/dead_loops
Remove all non-configurable dead loops
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/el3_common_macros.S | 3 | ||||
| -rw-r--r-- | include/plat/common/platform.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S index 32df7d76..0cd85c34 100644 --- a/include/common/el3_common_macros.S +++ b/include/common/el3_common_macros.S @@ -196,8 +196,7 @@ /* This is a cold boot on a secondary CPU */ bl plat_secondary_cold_boot_setup /* plat_secondary_cold_boot_setup() is not supposed to return */ - secondary_panic: - b secondary_panic + bl el3_panic do_primary_cold_boot: .endif /* _secondary_cold_boot */ diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index f37a80f3..5c61f381 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -83,6 +83,7 @@ void plat_report_exception(unsigned long); int plat_crash_console_init(void); int plat_crash_console_putc(int c); void plat_error_handler(int err) __dead2; +void plat_panic_handler(void) __dead2; /******************************************************************************* * Mandatory BL1 functions |