From a0ad6019ff308a6e4bef09a80c80b6e04053abee Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Wed, 23 Mar 2016 10:11:10 +0000 Subject: [PATCH] Modify return type of plat_get_ns_image_entrypoint() This patch modifies the return type of the platform API `plat_get_ns_image_entrypoint()` from `unsigned long` to `uintptr_t` in accordance with the coding guidelines. Change-Id: Icb4510ca98b706aa4d535fe27e203394184fb4ca --- docs/porting-guide.md | 2 +- include/plat/common/platform.h | 2 +- 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 f0adf5708..f1f14a8a9 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 5c61f3812..6f0a8a0f7 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 c84a65b3a..19a4931ae 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; }