diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-12-06 09:43:28 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-12-06 09:43:28 +0000 |
| commit | f224bd4ee28e1a5f13a4f029ed5038879e387ed4 (patch) | |
| tree | 5fa10f9ed50f3fb1808f8dd9870af62bc42a0262 /plat | |
| parent | b3257a3d39971663caf4da00b590958264ec46f8 (diff) | |
| parent | ebd6efae67c6a086bc97d807a638bde324d936dc (diff) | |
| download | platform_external_arm-trusted-firmware-f224bd4ee28e1a5f13a4f029ed5038879e387ed4.tar.gz platform_external_arm-trusted-firmware-f224bd4ee28e1a5f13a4f029ed5038879e387ed4.tar.bz2 platform_external_arm-trusted-firmware-f224bd4ee28e1a5f13a4f029ed5038879e387ed4.zip | |
Merge changes from topic "allwinner_bl31_size" into integration
* changes:
Reduce space lost to object alignment
imx: Fix multiple definition of ipc_handle
imx: Fix missing inclusion of cdefs.h
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/imx/common/include/imx_caam.h | 3 | ||||
| -rw-r--r-- | plat/imx/common/include/imx_snvs.h | 3 | ||||
| -rw-r--r-- | plat/imx/common/include/sci/sci_ipc.h | 4 | ||||
| -rw-r--r-- | plat/imx/common/sci/ipc.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h index 335bd0f8b..61005b51c 100644 --- a/plat/imx/common/include/imx_caam.h +++ b/plat/imx/common/include/imx_caam.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,6 +7,7 @@ #ifndef IMX_CAAM_H #define IMX_CAAM_H +#include <cdefs.h> #include <stdint.h> #include <arch.h> #include <imx_regs.h> diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h index 0b3d1085f..565c451dd 100644 --- a/plat/imx/common/include/imx_snvs.h +++ b/plat/imx/common/include/imx_snvs.h @@ -1,11 +1,12 @@ /* - * Copyright (C) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (C) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #ifndef IMX_SNVS_H #define IMX_SNVS_H +#include <cdefs.h> #include <stdint.h> #include <arch.h> diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h index 1167ea367..39e9012bc 100644 --- a/plat/imx/common/include/sci/sci_ipc.h +++ b/plat/imx/common/include/sci/sci_ipc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -62,6 +62,6 @@ void sc_ipc_read(sc_ipc_t ipc, void *data); */ void sc_ipc_write(sc_ipc_t ipc, void *data); -sc_ipc_t ipc_handle; +extern sc_ipc_t ipc_handle; #endif /* SCI_IPC_H */ diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c index 6491ca575..576911925 100644 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -13,6 +13,8 @@ #include <sci/sci_rpc.h> #include "imx8_mu.h" +sc_ipc_t ipc_handle; + DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); #define sc_ipc_lock_init() bakery_lock_init(&sc_ipc_bakery_lock) #define sc_ipc_lock() bakery_lock_get(&sc_ipc_bakery_lock) |