diff options
| author | danh-arm <dan.handley@arm.com> | 2016-07-25 12:29:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 12:29:52 +0100 |
| commit | 3dd9835f8ab3c2e7f57ddc92505d6c800bbacd47 (patch) | |
| tree | cbecea4cf95d12d01493f2241e846b02dc536f8c /plat/arm/common/arm_bl31_setup.c | |
| parent | bc469a84b5541bc717bc04712df73f4001847215 (diff) | |
| parent | 738b1fd7c0628e9c6cc89e36629f27bde01559df (diff) | |
Merge pull request #667 from soby-mathew/sm/PSCI_lib
Introduce PSCI library
Diffstat (limited to 'plat/arm/common/arm_bl31_setup.c')
| -rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 87cafced..4ed24772 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -38,7 +38,7 @@ #include <plat_arm.h> #include <platform.h> -#define BL31_END (unsigned long)(&__BL31_END__) +#define BL31_END (uintptr_t)(&__BL31_END__) #if USE_COHERENT_MEM /* @@ -48,8 +48,8 @@ * __COHERENT_RAM_START__ and __COHERENT_RAM_END__ linker symbols * refer to page-aligned addresses. */ -#define BL31_COHERENT_RAM_BASE (unsigned long)(&__COHERENT_RAM_START__) -#define BL31_COHERENT_RAM_LIMIT (unsigned long)(&__COHERENT_RAM_END__) +#define BL31_COHERENT_RAM_BASE (uintptr_t)(&__COHERENT_RAM_START__) +#define BL31_COHERENT_RAM_LIMIT (uintptr_t)(&__COHERENT_RAM_END__) #endif /* @@ -130,11 +130,8 @@ void arm_bl31_early_platform_setup(bl31_params_t *from_bl2, * Tell BL31 where the non-trusted software image * is located and the entry state information */ -#ifdef PRELOADED_BL33_BASE - bl33_image_ep_info.pc = PRELOADED_BL33_BASE; -#else bl33_image_ep_info.pc = plat_get_ns_image_entrypoint(); -#endif /* PRELOADED_BL33_BASE */ + bl33_image_ep_info.spsr = arm_get_spsr_for_bl33_entry(); SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE); |