diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-12-04 02:48:37 -0600 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2020-08-31 16:56:14 -0500 |
| commit | af31d150b46c4d341c7e2c851318db225cc6c10b (patch) | |
| tree | 675579cb7f02542f7d5dda904b268b0a9d9c3d27 | |
| parent | 2b93f4a8a277daf8f354790cde3728b62a0c1931 (diff) | |
imx: Fix missing inclusion of cdefs.h
This was found by compiling with -fno-common:
./build/picopi/release/bl2/imx_snvs.o:(.bss.__packed+0x0): multiple definition of `__packed';
./build/picopi/release/bl2/imx_caam.o:(.bss.__packed+0x0): first defined here
__packed was intended to be the attribute macro from cdefs.h, not an
object of the structure type.
Upstream-Status: Backport
Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: Id02fac3f098be2d71c35c6b4a18012515532f32a
| -rw-r--r-- | plat/imx/common/include/imx_caam.h | 3 | ||||
| -rw-r--r-- | plat/imx/common/include/imx_snvs.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h index 335bd0f8..61005b51 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 0b3d1085..565c451d 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> |