diff options
71 files changed, 108 insertions, 99 deletions
diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h index 42a74d22..583b61f4 100644 --- a/bl1/bl1_private.h +++ b/bl1/bl1_private.h @@ -7,7 +7,7 @@ #ifndef __BL1_PRIVATE_H__ #define __BL1_PRIVATE_H__ -#include <types.h> +#include <stdint.h> #include <utils_def.h> /******************************************************************************* diff --git a/bl32/sp_min/sp_min_main.c b/bl32/sp_min/sp_min_main.c index f06a48bf..59e88eb9 100644 --- a/bl32/sp_min/sp_min_main.c +++ b/bl32/sp_min/sp_min_main.c @@ -21,8 +21,8 @@ #include <stddef.h> #include <stdint.h> #include <std_svc.h> +#include <stdint.h> #include <string.h> -#include <types.h> #include <utils.h> #include "sp_min_private.h" diff --git a/include/bl31/ehf.h b/include/bl31/ehf.h index 14462798..c60b04cd 100644 --- a/include/bl31/ehf.h +++ b/include/bl31/ehf.h @@ -9,6 +9,7 @@ #ifndef __ASSEMBLY__ +#include <cdefs.h> #include <stdint.h> #include <utils_def.h> diff --git a/include/common/bl_common.h b/include/common/bl_common.h index f64e6aee..6478f12f 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -61,7 +61,6 @@ #include <cassert.h> #include <stddef.h> #include <stdint.h> -#include <types.h> #include <utils_def.h> /* To retain compatibility */ diff --git a/include/common/debug.h b/include/common/debug.h index 99f402c0..f60dfc17 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -26,6 +26,7 @@ #define LOG_LEVEL_VERBOSE 50 #ifndef __ASSEMBLY__ +#include <cdefs.h> #include <stdarg.h> #include <stdio.h> diff --git a/include/common/ep_info.h b/include/common/ep_info.h index 99a03906..bf3f7823 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.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 */ @@ -65,7 +65,7 @@ #ifndef __ASSEMBLY__ #include <cassert.h> -#include <types.h> +#include <stdint.h> typedef struct aapcs64_params { u_register_t arg0; diff --git a/include/common/param_header.h b/include/common/param_header.h index 4e61fadb..a5a08ec4 100644 --- a/include/common/param_header.h +++ b/include/common/param_header.h @@ -36,7 +36,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> /*************************************************************************** * This structure provides version information and the size of the diff --git a/include/drivers/arm/arm_gic.h b/include/drivers/arm/arm_gic.h index 019159f9..8d2a2322 100644 --- a/include/drivers/arm/arm_gic.h +++ b/include/drivers/arm/arm_gic.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,6 +7,7 @@ #ifndef __ARM_GIC_H__ #define __ARM_GIC_H__ +#include <cdefs.h> #include <stdint.h> /******************************************************************************* diff --git a/include/drivers/arm/gic_v3.h b/include/drivers/arm/gic_v3.h index 02f9006f..549b4d9f 100644 --- a/include/drivers/arm/gic_v3.h +++ b/include/drivers/arm/gic_v3.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 */ @@ -17,8 +17,6 @@ #include <mmio.h> #include <stdint.h> -#include <types.h> - /* GICv3 Re-distributor interface registers & shifts */ #define GICR_PCPUBASE_SHIFT 0x11 diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index 39c73027..925d1c25 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -116,6 +116,7 @@ #ifndef __ASSEMBLY__ +#include <cdefs.h> #include <interrupt_props.h> #include <stdint.h> diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index 37c92e4f..c13a5c9e 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -212,7 +212,6 @@ #include <gic_common.h> #include <interrupt_props.h> #include <stdint.h> -#include <types.h> #include <utils_def.h> #define gicv3_is_intr_id_special_identifier(id) \ diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index 06d75435..137764d3 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -85,7 +85,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct { console_t console; diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h index 7ab6df04..51de8e3d 100644 --- a/include/drivers/cadence/cdns_uart.h +++ b/include/drivers/cadence/cdns_uart.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 */ @@ -29,7 +29,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct { console_t console; diff --git a/include/drivers/console.h b/include/drivers/console.h index f9ed2e56..1f041b97 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -30,7 +30,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct console { struct console *next; diff --git a/include/drivers/dw_ufs.h b/include/drivers/dw_ufs.h index b05c7f54..a9774cf1 100644 --- a/include/drivers/dw_ufs.h +++ b/include/drivers/dw_ufs.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 */ @@ -7,7 +7,7 @@ #ifndef __DW_UFS_H__ #define __DW_UFS_H__ -#include <sys/types.h> +#include <stdint.h> /* Bus Throtting */ #define BUSTHRTL 0xC0 diff --git a/include/drivers/partition/partition.h b/include/drivers/partition/partition.h index 4951f8cf..047c7dda 100644 --- a/include/drivers/partition/partition.h +++ b/include/drivers/partition/partition.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 */ @@ -8,7 +8,7 @@ #define __PARTITION_H__ #include <cassert.h> -#include <types.h> +#include <stdint.h> #if !PLAT_PARTITION_MAX_ENTRIES # define PLAT_PARTITION_MAX_ENTRIES 128 diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h index b00f6642..9ee2a336 100644 --- a/include/drivers/ti/uart/uart_16550.h +++ b/include/drivers/ti/uart/uart_16550.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -75,7 +75,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct { console_t console; diff --git a/include/lib/aarch32/arch_helpers.h b/include/lib/aarch32/arch_helpers.h index aa68bcbe..8eda5cbd 100644 --- a/include/lib/aarch32/arch_helpers.h +++ b/include/lib/aarch32/arch_helpers.h @@ -8,8 +8,9 @@ #define __ARCH_HELPERS_H__ #include <arch.h> /* for additional register definitions */ +#include <cdefs.h> #include <stdint.h> -#include <sys/types.h> +#include <string.h> /********************************************************************** * Macros which create inline functions to read or write CPU system diff --git a/include/lib/aarch32/smccc_helpers.h b/include/lib/aarch32/smccc_helpers.h index 731c26fb..d6e525fd 100644 --- a/include/lib/aarch32/smccc_helpers.h +++ b/include/lib/aarch32/smccc_helpers.h @@ -26,7 +26,7 @@ #ifndef __ASSEMBLY__ #include <cassert.h> -#include <types.h> +#include <stdint.h> /* * The generic structure to save arguments and callee saved registers during diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index 8e82dbdc..067c374a 100644 --- a/include/lib/aarch64/arch_helpers.h +++ b/include/lib/aarch64/arch_helpers.h @@ -10,7 +10,7 @@ #include <arch.h> /* for additional register definitions */ #include <cdefs.h> /* For __dead2 */ #include <stdint.h> -#include <sys/types.h> +#include <string.h> /********************************************************************** * Macros which create inline functions to read or write CPU system diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index d4645c36..c80082e9 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,6 +12,7 @@ #define BAKERY_LOCK_MAX_CPUS PLATFORM_CORE_COUNT #ifndef __ASSEMBLY__ +#include <cdefs.h> #include <stdint.h> /***************************************************************************** diff --git a/include/lib/cassert.h b/include/lib/cassert.h index 40cb483a..3119e1f8 100644 --- a/include/lib/cassert.h +++ b/include/lib/cassert.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,6 +7,8 @@ #ifndef __CASSERT_H__ #define __CASSERT_H__ +#include <cdefs.h> + /******************************************************************************* * Macro to flag a compile time assertion. It uses the preprocessor to generate * an invalid C construct if 'cond' evaluates to false. diff --git a/include/lib/coreboot.h b/include/lib/coreboot.h index 4b1f200a..f8fbd93d 100644 --- a/include/lib/coreboot.h +++ b/include/lib/coreboot.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 */ @@ -7,7 +7,7 @@ #ifndef __COREBOOT_H__ #define __COREBOOT_H__ -#include <types.h> +#include <stdint.h> typedef struct { uint32_t type; /* always 2 (memory-mapped) on ARM */ diff --git a/include/lib/extensions/amu.h b/include/lib/extensions/amu.h index 559c8f13..46d5e159 100644 --- a/include/lib/extensions/amu.h +++ b/include/lib/extensions/amu.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 */ @@ -10,7 +10,6 @@ #include <cassert.h> #include <platform_def.h> #include <stdint.h> -#include <sys/cdefs.h> /* for CASSERT() */ /* All group 0 counters */ #define AMU_GROUP0_COUNTERS_MASK 0xf diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index 71d605d6..fa0da9fe 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -171,7 +171,6 @@ #ifndef __ASSEMBLY__ #include <stdint.h> -#include <types.h> /* Function to help build the psci capabilities bitfield */ diff --git a/include/lib/psci/psci_lib.h b/include/lib/psci/psci_lib.h index 5b30f55e..134cad9e 100644 --- a/include/lib/psci/psci_lib.h +++ b/include/lib/psci/psci_lib.h @@ -10,7 +10,8 @@ #include <ep_info.h> #ifndef __ASSEMBLY__ -#include <types.h> +#include <cdefs.h> +#include <stdint.h> /******************************************************************************* * Optional structure populated by the Secure Payload Dispatcher to be given a diff --git a/include/lib/spinlock.h b/include/lib/spinlock.h index a7b0d394..8aec7078 100644 --- a/include/lib/spinlock.h +++ b/include/lib/spinlock.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 */ @@ -9,7 +9,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct spinlock { volatile uint32_t lock; diff --git a/include/lib/utils.h b/include/lib/utils.h index 5f13e993..09ec8d99 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -17,7 +17,7 @@ */ #if !(defined(__LINKER__) || defined(__ASSEMBLY__)) -#include <types.h> +#include <stdint.h> typedef struct mem_region { uintptr_t base; diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index e1d02277..ab491e36 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h @@ -54,7 +54,7 @@ #include <stdbool.h> #include <stdint.h> -#include <sys/types.h> +#include <string.h> /* * Return the values that the MMU configuration registers must contain for the diff --git a/include/plat/arm/css/common/css_pm.h b/include/plat/arm/css/common/css_pm.h index e834fffc..a2436713 100644 --- a/include/plat/arm/css/common/css_pm.h +++ b/include/plat/arm/css/common/css_pm.h @@ -9,7 +9,7 @@ #include <cdefs.h> #include <psci.h> -#include <types.h> +#include <stdint.h> /* System power domain at level 2, as currently implemented by CSS platforms */ #define CSS_SYSTEM_PWR_DMN_LVL ARM_PWR_LVL2 diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 827d416f..e66af782 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -8,6 +8,7 @@ #include <bl_common.h> #include <platform_def.h> +#include <xlat_tables_defs.h> /****************************************************************************** * Required platform porting definitions that are expected to be common to diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 12eac60b..dae95895 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -9,8 +9,6 @@ #include <psci.h> #include <stdint.h> -#include <types.h> - /******************************************************************************* * Forward declarations diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index d4aff1cc..8b0adc80 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -7,7 +7,7 @@ #ifndef __SECURE_PARTITION_H__ #define __SECURE_PARTITION_H__ -#include <types.h> +#include <stdint.h> #include <utils_def.h> /* diff --git a/lib/compiler-rt/builtins/int_lib.h b/lib/compiler-rt/builtins/int_lib.h index 57dfc413..787777a1 100644 --- a/lib/compiler-rt/builtins/int_lib.h +++ b/lib/compiler-rt/builtins/int_lib.h @@ -14,7 +14,7 @@ */ /* - * Portions copyright (c) 2017, ARM Limited and Contributors. + * Portions copyright (c) 2017-2018, ARM Limited and Contributors. * All rights reserved. */ @@ -63,9 +63,8 @@ * Kernel and boot environment can't use normal headers, * so use the equivalent system headers. */ -# include <sys/limits.h> -# include <sys/stdint.h> -# include <sys/types.h> +# include <limits.h> +# include <stdint.h> /* Include the commonly used internal type definitions. */ #include "int_types.h" diff --git a/lib/libc/assert.c b/lib/libc/assert.c index 721b6e54..2d2396ca 100644 --- a/lib/libc/assert.c +++ b/lib/libc/assert.c @@ -1,10 +1,11 @@ /* - * 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 */ #include <assert.h> +#include <cdefs.h> #include <console.h> #include <debug.h> #include <platform.h> diff --git a/lib/xlat_tables/aarch64/xlat_tables.c b/lib/xlat_tables/aarch64/xlat_tables.c index d88d7b16..4afdeed0 100644 --- a/lib/xlat_tables/aarch64/xlat_tables.c +++ b/lib/xlat_tables/aarch64/xlat_tables.c @@ -10,7 +10,7 @@ #include <bl_common.h> #include <common_def.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include <utils.h> #include <xlat_tables.h> #include <xlat_tables_arch.h> diff --git a/lib/xlat_tables/xlat_tables_common.c b/lib/xlat_tables/xlat_tables_common.c index 65d3f0f6..96326015 100644 --- a/lib/xlat_tables/xlat_tables_common.c +++ b/lib/xlat_tables/xlat_tables_common.c @@ -12,8 +12,8 @@ #include <debug.h> #include <platform_def.h> #include <stdbool.h> +#include <stdint.h> #include <string.h> -#include <types.h> #include <utils.h> #include <xlat_tables.h> #include "xlat_tables_private.h" diff --git a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c index d1555bf2..269adc7e 100644 --- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c +++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c @@ -9,7 +9,7 @@ #include <assert.h> #include <cassert.h> #include <stdbool.h> -#include <sys/types.h> +#include <stdint.h> #include <utils_def.h> #include <xlat_tables_v2.h> #include "../xlat_tables_private.h" diff --git a/lib/xlat_tables_v2/xlat_tables_core.c b/lib/xlat_tables_v2/xlat_tables_core.c index 0340bf63..003718e7 100644 --- a/lib/xlat_tables_v2/xlat_tables_core.c +++ b/lib/xlat_tables_v2/xlat_tables_core.c @@ -10,8 +10,8 @@ #include <errno.h> #include <platform_def.h> #include <stdbool.h> +#include <stdint.h> #include <string.h> -#include <types.h> #include <utils_def.h> #include <xlat_tables_defs.h> #include <xlat_tables_v2.h> diff --git a/lib/xlat_tables_v2/xlat_tables_utils.c b/lib/xlat_tables_v2/xlat_tables_utils.c index 05533c61..aef3c9a1 100644 --- a/lib/xlat_tables_v2/xlat_tables_utils.c +++ b/lib/xlat_tables_v2/xlat_tables_utils.c @@ -10,7 +10,7 @@ #include <errno.h> #include <platform_def.h> #include <stdbool.h> -#include <types.h> +#include <stdint.h> #include <utils_def.h> #include <xlat_tables_defs.h> #include <xlat_tables_v2.h> diff --git a/plat/arm/css/drivers/scp/css_scp.h b/plat/arm/css/drivers/scp/css_scp.h index 671612a8..44dfbca0 100644 --- a/plat/arm/css/drivers/scp/css_scp.h +++ b/plat/arm/css/drivers/scp/css_scp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,7 +9,7 @@ #include <cassert.h> #include <platform_def.h> -#include <types.h> +#include <stdint.h> /* Forward declarations */ struct psci_power_state; diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c index 863ad2b4..43d7b7ad 100644 --- a/plat/hisilicon/hikey/hikey_security.c +++ b/plat/hisilicon/hikey/hikey_security.c @@ -8,7 +8,7 @@ #include <debug.h> #include <platform_def.h> #include <stdint.h> -#include <strings.h> +#include <string.h> #include <utils_def.h> #include "hikey_private.h" diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 4ff91bda..33f955df 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -52,7 +52,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct { console_t console; diff --git a/plat/imx/common/include/sci/sci_scfw.h b/plat/imx/common/include/sci/sci_scfw.h index 9d08dad4..781c69e0 100644 --- a/plat/imx/common/include/sci/sci_scfw.h +++ b/plat/imx/common/include/sci/sci_scfw.h @@ -9,7 +9,7 @@ /* Includes */ -#include <types.h> +#include <stdint.h> #ifdef __cplusplus #define __I volatile /*!< Defines 'read only' permissions */ diff --git a/plat/imx/common/sci/imx8_mu.h b/plat/imx/common/sci/imx8_mu.h index 8834a976..8c788772 100644 --- a/plat/imx/common/sci/imx8_mu.h +++ b/plat/imx/common/sci/imx8_mu.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <types.h> +#include <stdint.h> #define MU_ATR0_OFFSET1 0x0 #define MU_ARR0_OFFSET1 0x10 diff --git a/plat/layerscape/board/ls1043/ls1043_psci.c b/plat/layerscape/board/ls1043/ls1043_psci.c index 1c83df43..b402e7f7 100644 --- a/plat/layerscape/board/ls1043/ls1043_psci.c +++ b/plat/layerscape/board/ls1043/ls1043_psci.c @@ -5,15 +5,15 @@ */ #include <arch_helpers.h> +#include <assert.h> #include <debug.h> +#include <delay_timer.h> +#include <endian.h> #include <errno.h> -#include <assert.h> +#include <gicv2.h> +#include <mmio.h> #include <platform.h> #include <psci.h> -#include <mmio.h> -#include <sys/endian.h> -#include <gicv2.h> -#include <delay_timer.h> #include "platform_def.h" #define LS_SCFG_BASE 0x01570000 diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index 503a01df..8daafbb4 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -65,7 +65,7 @@ #ifndef __ASSEMBLY__ -#include <types.h> +#include <stdint.h> typedef struct { console_t console; diff --git a/plat/layerscape/common/include/plat_ls.h b/plat/layerscape/common/include/plat_ls.h index 9d5ec145..05b9c053 100644 --- a/plat/layerscape/common/include/plat_ls.h +++ b/plat/layerscape/common/include/plat_ls.h @@ -7,8 +7,8 @@ #ifndef __PLAT_LS_H__ #define __PLAT_LS_H__ -#include <sys/types.h> #include <cpu_data.h> +#include <stdint.h> /* BL1 utility functions */ void ls_bl1_platform_setup(void); diff --git a/plat/nvidia/tegra/common/drivers/smmu/smmu.c b/plat/nvidia/tegra/common/drivers/smmu/smmu.c index fa3f0002..4b9edb62 100644 --- a/plat/nvidia/tegra/common/drivers/smmu/smmu.c +++ b/plat/nvidia/tegra/common/drivers/smmu/smmu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,6 +12,8 @@ #include <string.h> #include <tegra_private.h> +extern void memcpy16(void *dest, const void *src, unsigned int length); + /* SMMU IDs currently supported by the driver */ enum { TEGRA_SMMU0, diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c index f0a7036e..65997687 100644 --- a/plat/nvidia/tegra/common/tegra_bl31_setup.c +++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c @@ -28,6 +28,7 @@ /* length of Trusty's input parameters (in bytes) */ #define TRUSTY_PARAMS_LEN_BYTES (4096*2) +extern void memcpy16(void *dest, const void *src, unsigned int length); extern void zeromem16(void *mem, unsigned int length); /******************************************************************************* diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h index 60c8a040..b72653e4 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -11,7 +11,7 @@ #ifndef __ASSEMBLY__ -#include <sys/types.h> +#include <stdint.h> /******************************************************************************* * StreamID to indicate no SMMU translations (requests to be steered on the diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h index fbaad6e7..db79fbe2 100644 --- a/plat/nvidia/tegra/include/tegra_platform.h +++ b/plat/nvidia/tegra/include/tegra_platform.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 */ @@ -7,7 +7,7 @@ #ifndef __TEGRA_PLATFORM_H__ #define __TEGRA_PLATFORM_H__ -#include <sys/cdefs.h> +#include <cdefs.h> /* * Tegra chip major/minor version diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c index 7eb6c6c8..7126c3ba 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,10 +10,10 @@ #include <debug.h> #include <delay_timer.h> #include <denver.h> +#include <errno.h> #include <mce_private.h> #include <mmio.h> #include <platform.h> -#include <sys/errno.h> #include <t18x_ari.h> /******************************************************************************* diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c b/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c index 1353b6ab..712519f9 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,11 +12,11 @@ #include <context_mgmt.h> #include <debug.h> #include <denver.h> +#include <errno.h> #include <mce.h> #include <mce_private.h> #include <mmio.h> #include <string.h> -#include <sys/errno.h> #include <t18x_ari.h> #include <tegra_def.h> #include <tegra_platform.h> diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c index 243c8f3a..857cfbb5 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,9 +8,9 @@ #include <arch_helpers.h> #include <debug.h> #include <denver.h> +#include <errno.h> #include <mce_private.h> #include <mmio.h> -#include <sys/errno.h> #include <t18x_ari.h> int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time) diff --git a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c index 095614e4..6eb18fa6 100644 --- a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -20,6 +20,8 @@ #include <t18x_ari.h> #include <tegra_private.h> +extern void memcpy16(void *dest, const void *src, unsigned int length); + extern void prepare_cpu_pwr_dwn(void); extern void tegra186_cpu_reset_handler(void); extern uint32_t __tegra186_cpu_reset_handler_end, diff --git a/plat/nvidia/tegra/soc/t186/plat_secondary.c b/plat/nvidia/tegra/soc/t186/plat_secondary.c index 52daab21..ebc2b46a 100644 --- a/plat/nvidia/tegra/soc/t186/plat_secondary.c +++ b/plat/nvidia/tegra/soc/t186/plat_secondary.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -21,6 +21,8 @@ #define CPU_RESET_MODE_AA64 1 +extern void memcpy16(void *dest, const void *src, unsigned int length); + extern uint64_t tegra_bl31_phys_base; extern uint64_t __tegra186_cpu_reset_handler_end; diff --git a/plat/qemu/qemu_private.h b/plat/qemu/qemu_private.h index 800fa037..0fb7cd5f 100644 --- a/plat/qemu/qemu_private.h +++ b/plat/qemu/qemu_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,9 +7,8 @@ #ifndef __QEMU_PRIVATE_H #define __QEMU_PRIVATE_H -#include <sys/types.h> +#include <stdint.h> -#include <xlat_tables_defs.h> #include "../../bl1/bl1_private.h" void qemu_configure_mmu_secure(unsigned long total_base, diff --git a/plat/qemu/topology.c b/plat/qemu/topology.c index d7ba9b7e..569d15f8 100644 --- a/plat/qemu/topology.c +++ b/plat/qemu/topology.c @@ -1,12 +1,12 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #include <arch.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include "qemu_private.h" /* The power domain tree descriptor */ diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c index f1a5e2b7..2adab8fb 100644 --- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <cdefs.h> #include <cdn_dp.h> #include <smccc.h> #include <stdlib.h> diff --git a/plat/rpi3/rpi3_private.h b/plat/rpi3/rpi3_private.h index 91b7add8..368d09b2 100644 --- a/plat/rpi3/rpi3_private.h +++ b/plat/rpi3/rpi3_private.h @@ -7,7 +7,7 @@ #ifndef __RPI3_PRIVATE_H__ #define __RPI3_PRIVATE_H__ -#include <sys/types.h> +#include <stdint.h> /******************************************************************************* * Function and variable prototypes diff --git a/plat/rpi3/rpi3_stack_protector.c b/plat/rpi3/rpi3_stack_protector.c index d939cd39..812f6edf 100644 --- a/plat/rpi3/rpi3_stack_protector.c +++ b/plat/rpi3/rpi3_stack_protector.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <sys/types.h> +#include <stdint.h> #include <utils.h> #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_topology.c b/plat/rpi3/rpi3_topology.c index 0e03ec32..31a22a46 100644 --- a/plat/rpi3/rpi3_topology.c +++ b/plat/rpi3/rpi3_topology.c @@ -1,12 +1,12 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #include <arch.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include "rpi3_private.h" diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h index 58b1e24e..7f0633a5 100644 --- a/plat/socionext/synquacer/include/sq_common.h +++ b/plat/socionext/synquacer/include/sq_common.h @@ -7,7 +7,7 @@ #ifndef __SQ_COMMON_H__ #define __SQ_COMMON_H__ -#include <sys/types.h> +#include <stdint.h> #include <xlat_tables_v2.h> struct draminfo { diff --git a/plat/socionext/uniphier/uniphier.h b/plat/socionext/uniphier/uniphier.h index 1768e3be..7ff14641 100644 --- a/plat/socionext/uniphier/uniphier.h +++ b/plat/socionext/uniphier/uniphier.h @@ -8,7 +8,7 @@ #define __UNIPHIER_H__ #include <stdint.h> -#include <types.h> +#include <string.h> unsigned int uniphier_get_soc_type(void); unsigned int uniphier_get_soc_model(void); diff --git a/plat/socionext/uniphier/uniphier_emmc.c b/plat/socionext/uniphier/uniphier_emmc.c index fcd4cb40..db87637b 100644 --- a/plat/socionext/uniphier/uniphier_emmc.c +++ b/plat/socionext/uniphier/uniphier_emmc.c @@ -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 */ @@ -9,7 +9,7 @@ #include <io/io_block.h> #include <mmio.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include <utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_io_storage.c b/plat/socionext/uniphier/uniphier_io_storage.c index ed1f6fae..1fd835b5 100644 --- a/plat/socionext/uniphier/uniphier_io_storage.c +++ b/plat/socionext/uniphier/uniphier_io_storage.c @@ -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 */ @@ -12,7 +12,7 @@ #include <io/io_fip.h> #include <io/io_memmap.h> #include <platform_def.h> -#include <types.h> +#include <stdint.h> #include <utils_def.h> #include <xlat_tables_v2.h> diff --git a/plat/socionext/uniphier/uniphier_nand.c b/plat/socionext/uniphier/uniphier_nand.c index a118b851..c8e825d6 100644 --- a/plat/socionext/uniphier/uniphier_nand.c +++ b/plat/socionext/uniphier/uniphier_nand.c @@ -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 */ @@ -9,7 +9,7 @@ #include <io/io_block.h> #include <mmio.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include <utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_usb.c b/plat/socionext/uniphier/uniphier_usb.c index 4be0e908..b51b6012 100644 --- a/plat/socionext/uniphier/uniphier_usb.c +++ b/plat/socionext/uniphier/uniphier_usb.c @@ -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 */ @@ -9,7 +9,7 @@ #include <io/io_block.h> #include <mmio.h> #include <platform_def.h> -#include <sys/types.h> +#include <stdint.h> #include <utils_def.h> #include "uniphier.h" diff --git a/services/std_svc/sdei/sdei_private.h b/services/std_svc/sdei/sdei_private.h index d99aceac..f5197c61 100644 --- a/services/std_svc/sdei/sdei_private.h +++ b/services/std_svc/sdei/sdei_private.h @@ -17,7 +17,7 @@ #include <setjmp.h> #include <spinlock.h> #include <stdbool.h> -#include <types.h> +#include <stdint.h> #include <utils_def.h> #ifdef AARCH32 diff --git a/services/std_svc/spm/spm_shim_private.h b/services/std_svc/spm/spm_shim_private.h index 8408d1e0..e65ac44d 100644 --- a/services/std_svc/spm/spm_shim_private.h +++ b/services/std_svc/spm/spm_shim_private.h @@ -7,7 +7,7 @@ #ifndef __SPM_SHIM_PRIVATE__ #define __SPM_SHIM_PRIVATE__ -#include <types.h> +#include <stdint.h> #include <utils_def.h> /* Assembly source */ |