diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-03-29 09:59:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 09:59:52 +0100 |
| commit | e74af2afd0886a1b425757ff348396bffd0a580e (patch) | |
| tree | 34de46f0991d30b29e21fbcb0df1bdf38ce14f12 /services | |
| parent | 0b7477234a5b9c46eedbdeb69ccec6ccf3872465 (diff) | |
| parent | 9f85f9e3796f1c351bbc4c8436dc66d83c140b71 (diff) | |
| download | platform_external_arm-trusted-firmware-e74af2afd0886a1b425757ff348396bffd0a580e.tar.gz platform_external_arm-trusted-firmware-e74af2afd0886a1b425757ff348396bffd0a580e.tar.bz2 platform_external_arm-trusted-firmware-e74af2afd0886a1b425757ff348396bffd0a580e.zip | |
Merge pull request #1335 from JoelHutton/jh/cleanup_void_pointers
Clean usage of void pointers to access symbols
Diffstat (limited to 'services')
| -rw-r--r-- | services/std_svc/spm/spm_shim_private.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/services/std_svc/spm/spm_shim_private.h b/services/std_svc/spm/spm_shim_private.h index ad953cde7..8408d1e04 100644 --- a/services/std_svc/spm/spm_shim_private.h +++ b/services/std_svc/spm/spm_shim_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,21 +8,17 @@ #define __SPM_SHIM_PRIVATE__ #include <types.h> +#include <utils_def.h> /* Assembly source */ -extern uintptr_t spm_shim_exceptions_ptr; +IMPORT_SYM(uintptr_t, spm_shim_exceptions_ptr, SPM_SHIM_EXCEPTIONS_PTR); /* Linker symbols */ -extern uintptr_t __SPM_SHIM_EXCEPTIONS_START__; -extern uintptr_t __SPM_SHIM_EXCEPTIONS_END__; +IMPORT_SYM(uintptr_t, __SPM_SHIM_EXCEPTIONS_START__, SPM_SHIM_EXCEPTIONS_START); +IMPORT_SYM(uintptr_t, __SPM_SHIM_EXCEPTIONS_END__, SPM_SHIM_EXCEPTIONS_END); /* Definitions */ -#define SPM_SHIM_EXCEPTIONS_PTR (uintptr_t)(&spm_shim_exceptions_ptr) -#define SPM_SHIM_EXCEPTIONS_START \ - (uintptr_t)(&__SPM_SHIM_EXCEPTIONS_START__) -#define SPM_SHIM_EXCEPTIONS_END \ - (uintptr_t)(&__SPM_SHIM_EXCEPTIONS_END__) #define SPM_SHIM_EXCEPTIONS_SIZE \ (SPM_SHIM_EXCEPTIONS_END - SPM_SHIM_EXCEPTIONS_START) |