diff options
| author | danh-arm <dan.handley@arm.com> | 2016-04-04 13:39:32 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-04-04 13:39:32 +0100 |
| commit | af711c1e0fbf69b47df3575a8aec5204f1439896 (patch) | |
| tree | 8348a7bd7a1efcdbb102fcdb8dfa427422fdcfb5 | |
| parent | c29164179588f066c7d07868a5ae3ce7dbc88fca (diff) | |
| parent | a0ad6019ff308a6e4bef09a80c80b6e04053abee (diff) | |
Merge pull request #580 from soby-mathew/sm/ret_type_plat_ns_ep
Modify return type of plat_get_ns_image_entrypoint()
| -rw-r--r-- | docs/porting-guide.md | 2 | ||||
| -rw-r--r-- | include/plat/common/platform.h | 2 | ||||
| -rw-r--r-- | plat/arm/common/aarch64/arm_common.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/porting-guide.md b/docs/porting-guide.md index 944c7987..f8d0ff38 100644 --- a/docs/porting-guide.md +++ b/docs/porting-guide.md @@ -1259,7 +1259,7 @@ later Bootloader stages with MMU off ### Function : plat_get_ns_image_entrypoint() [mandatory] Argument : void - Return : unsigned long + Return : uintptr_t As previously described, BL2 is responsible for arranging for control to be passed to a normal world BL image through BL31. This function returns the diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 5c61f381..6f0a8a0f 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -60,7 +60,7 @@ uint64_t plat_get_syscnt_freq(void); int plat_get_image_source(unsigned int image_id, uintptr_t *dev_handle, uintptr_t *image_spec); -unsigned long plat_get_ns_image_entrypoint(void); +uintptr_t plat_get_ns_image_entrypoint(void); unsigned int plat_my_core_pos(void); int plat_core_pos_by_mpidr(u_register_t mpidr); diff --git a/plat/arm/common/aarch64/arm_common.c b/plat/arm/common/aarch64/arm_common.c index c84a65b3..19a4931a 100644 --- a/plat/arm/common/aarch64/arm_common.c +++ b/plat/arm/common/aarch64/arm_common.c @@ -93,7 +93,7 @@ DEFINE_CONFIGURE_MMU_EL(1) DEFINE_CONFIGURE_MMU_EL(3) -unsigned long plat_get_ns_image_entrypoint(void) +uintptr_t plat_get_ns_image_entrypoint(void) { return PLAT_ARM_NS_IMAGE_OFFSET; } |