diff options
| author | danh-arm <dan.handley@arm.com> | 2016-06-03 15:12:37 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-06-03 15:12:37 +0100 |
| commit | 8d8c61ea75d668ce4f13e5f7ebc5e56741b3f1bd (patch) | |
| tree | 939fed21a2d2ddbb5dfec8234f5dff27e601078a /bl1 | |
| parent | a7e530331d7cf4b58618f0715e61b5a872176f07 (diff) | |
| parent | 8cd16e6b5b4a83a2cf704362b9acb1c2eea1417e (diff) | |
Merge pull request #636 from soby-mathew/sm/cpu_ctx_rem_aarch32_regs
Build option to include AArch32 registers in cpu context
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/bl1_context_mgmt.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/bl1/bl1_context_mgmt.c b/bl1/bl1_context_mgmt.c index bd40608b..972c7f68 100644 --- a/bl1/bl1_context_mgmt.c +++ b/bl1/bl1_context_mgmt.c @@ -32,6 +32,7 @@ #include <assert.h> #include <context.h> #include <context_mgmt.h> +#include <debug.h> #include <platform.h> /* @@ -66,6 +67,19 @@ void bl1_prepare_next_image(unsigned int image_id) image_desc_t *image_desc; entry_point_info_t *next_bl_ep; +#if CTX_INCLUDE_AARCH32_REGS + /* + * Ensure that the build flag to save AArch32 system registers in CPU + * context is not set for AArch64-only platforms. + */ + if (((read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL1_SHIFT) + & ID_AA64PFR0_ELX_MASK) == 0x1) { + ERROR("EL1 supports AArch64-only. Please set build flag " + "CTX_INCLUDE_AARCH32_REGS = 0"); + panic(); + } +#endif + /* Get the image descriptor. */ image_desc = bl1_plat_get_image_desc(image_id); assert(image_desc); |