From 550740833d4cdd5e125c155200996a62db7e891d Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 7 Jun 2017 16:45:42 +0200 Subject: bl: security_state should be of type unsigned int security_state is either 0 or 1. Prevent sign conversion potential error (setting -Werror=sign-conversion results in a build error). Signed-off-by: Yann Gautier Signed-off-by: Etienne Carriere --- bl1/aarch32/bl1_context_mgmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bl1') diff --git a/bl1/aarch32/bl1_context_mgmt.c b/bl1/aarch32/bl1_context_mgmt.c index cbf5cb69..10c90f9c 100644 --- a/bl1/aarch32/bl1_context_mgmt.c +++ b/bl1/aarch32/bl1_context_mgmt.c @@ -26,13 +26,13 @@ static void *bl1_next_cpu_context_ptr; static void *bl1_next_smc_context_ptr; /* Following functions are used for SMC context handling */ -void *smc_get_ctx(int security_state) +void *smc_get_ctx(unsigned int security_state) { assert(sec_state_is_valid(security_state)); return &bl1_smc_context[security_state]; } -void smc_set_next_ctx(int security_state) +void smc_set_next_ctx(unsigned int security_state) { assert(sec_state_is_valid(security_state)); bl1_next_smc_context_ptr = &bl1_smc_context[security_state]; -- cgit v1.2.3 From 2ed7b71e43519524af719d02efa5cbd3e20b1ce4 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 23 Jun 2017 09:37:49 +0200 Subject: context_mgmt: declare extern cm_set_next_context() for AArch32 This change avoids warning when setting -Wmissing-prototypes to compile bl1_context_mgmt.c. Reported-by: Yann Gautier Signed-off-by: Etienne Carriere --- bl1/bl1_fwu.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'bl1') diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 205ea922..7dd76535 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -52,8 +52,6 @@ static unsigned int sec_exec_image_id = INVALID_IMAGE_ID; /* Authentication status of each image. */ extern unsigned int auth_img_flags[]; -void cm_set_next_context(void *cpu_context); - /******************************************************************************* * Top level handler for servicing FWU SMCs. ******************************************************************************/ -- cgit v1.2.3 From c04d59cf379c679b2272d669ac0b337e407470a8 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 7 Jun 2017 16:41:50 +0200 Subject: bl1: include bl1_private.h in aarch* files This change avoids warnings when setting -Wmissing-prototypes or when using sparse tool. Signed-off-by: Yann Gautier Signed-off-by: Etienne Carriere --- bl1/aarch32/bl1_arch_setup.c | 1 + bl1/aarch32/bl1_context_mgmt.c | 1 + bl1/aarch64/bl1_arch_setup.c | 1 + bl1/aarch64/bl1_context_mgmt.c | 1 + 4 files changed, 4 insertions(+) (limited to 'bl1') diff --git a/bl1/aarch32/bl1_arch_setup.c b/bl1/aarch32/bl1_arch_setup.c index 23a65648..ce04aaab 100644 --- a/bl1/aarch32/bl1_arch_setup.c +++ b/bl1/aarch32/bl1_arch_setup.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "../bl1_private.h" /******************************************************************************* * TODO: Function that does the first bit of architectural setup. diff --git a/bl1/aarch32/bl1_context_mgmt.c b/bl1/aarch32/bl1_context_mgmt.c index 10c90f9c..6623dfc4 100644 --- a/bl1/aarch32/bl1_context_mgmt.c +++ b/bl1/aarch32/bl1_context_mgmt.c @@ -11,6 +11,7 @@ #include #include #include +#include "../bl1_private.h" /* * Following arrays will be used for context management. diff --git a/bl1/aarch64/bl1_arch_setup.c b/bl1/aarch64/bl1_arch_setup.c index a7a45225..624bd80f 100644 --- a/bl1/aarch64/bl1_arch_setup.c +++ b/bl1/aarch64/bl1_arch_setup.c @@ -6,6 +6,7 @@ #include #include +#include "../bl1_private.h" /******************************************************************************* * Function that does the first bit of architectural setup that affects diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c index 2c7fe070..b9304dcf 100644 --- a/bl1/aarch64/bl1_context_mgmt.c +++ b/bl1/aarch64/bl1_context_mgmt.c @@ -10,6 +10,7 @@ #include #include #include +#include "../bl1_private.h" /* * Following array will be used for context management. -- cgit v1.2.3