aboutsummaryrefslogtreecommitdiffstats
path: root/include/common
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-02-28 18:53:30 +0000
committerGitHub <noreply@github.com>2018-02-28 18:53:30 +0000
commit73a9605197ba04aaf02d436a2a4ad56e695b426c (patch)
tree5beb6774d0dabeffdfb6dc3753e9eb4ac2f62754 /include/common
parentfd50c18adbdb5b7c4cfd1f4661e905b56a7676fe (diff)
parentfd116b9f6c26d7fd49c7aa0cdbfb3d93871daec3 (diff)
downloadplatform_external_arm-trusted-firmware-73a9605197ba04aaf02d436a2a4ad56e695b426c.tar.gz
platform_external_arm-trusted-firmware-73a9605197ba04aaf02d436a2a4ad56e695b426c.tar.bz2
platform_external_arm-trusted-firmware-73a9605197ba04aaf02d436a2a4ad56e695b426c.zip
Merge pull request #1282 from robertovargas-arm/misra-changes
Misra changes
Diffstat (limited to 'include/common')
-rw-r--r--include/common/bl_common.h4
-rw-r--r--include/common/desc_image_load.h5
-rw-r--r--include/common/runtime_svc.h4
3 files changed, 9 insertions, 4 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h
index 6a249f5b2..4ef916f53 100644
--- a/include/common/bl_common.h
+++ b/include/common/bl_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -210,7 +210,6 @@ int load_auth_image(unsigned int image_id, image_info_t *image_data);
#else
-uintptr_t page_align(uintptr_t, unsigned);
int load_image(meminfo_t *mem_layout,
unsigned int image_id,
uintptr_t image_base,
@@ -230,6 +229,7 @@ extern const char build_message[];
extern const char version_string[];
void print_entry_point_info(const entry_point_info_t *ep_info);
+uintptr_t page_align(uintptr_t value, unsigned dir);
#endif /*__ASSEMBLY__*/
diff --git a/include/common/desc_image_load.h b/include/common/desc_image_load.h
index f183db50d..73aa27cca 100644
--- a/include/common/desc_image_load.h
+++ b/include/common/desc_image_load.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -19,6 +19,9 @@ typedef struct bl_mem_params_node {
bl_params_node_t params_node_mem;
} bl_mem_params_node_t;
+extern bl_mem_params_node_t *bl_mem_params_desc_ptr;
+extern unsigned int bl_mem_params_desc_num;
+
/*
* Macro to register list of BL image descriptors,
* defined as an array of bl_mem_params_node_t.
diff --git a/include/common/runtime_svc.h b/include/common/runtime_svc.h
index e179e4bac..6150b3227 100644
--- a/include/common/runtime_svc.h
+++ b/include/common/runtime_svc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -126,5 +126,7 @@ extern uintptr_t __RT_SVC_DESCS_START__;
extern uintptr_t __RT_SVC_DESCS_END__;
void init_crash_reporting(void);
+extern uint8_t rt_svc_descs_indices[MAX_RT_SVCS];
+
#endif /*__ASSEMBLY__*/
#endif /* __RUNTIME_SVC_H__ */