diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-11-08 10:20:19 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-11-08 10:20:19 +0000 |
| commit | c3cf06f1a3a9b9ee8ac7a0ae505f95c45f7dca84 (patch) | |
| tree | a10cbb4dba8a33d5a444ed37486f013f19eab635 /include | |
| parent | f5ae1b0e098277a5b02a823a23f61577e53eadf2 (diff) | |
| download | platform_external_arm-trusted-firmware-c3cf06f1a3a9b9ee8ac7a0ae505f95c45f7dca84.tar.gz platform_external_arm-trusted-firmware-c3cf06f1a3a9b9ee8ac7a0ae505f95c45f7dca84.tar.bz2 platform_external_arm-trusted-firmware-c3cf06f1a3a9b9ee8ac7a0ae505f95c45f7dca84.zip | |
Standardise header guards across codebase
All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.
The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.
The exceptions are files that are imported from other projects:
- CryptoCell driver
- dt-bindings folders
- zlib headers
Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
188 files changed, 586 insertions, 543 deletions
diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h index dd03de05c..39b8d1ede 100644 --- a/include/bl1/bl1.h +++ b/include/bl1/bl1.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __BL1_FWU_H__ -#define __BL1_FWU_H__ +#ifndef BL1_H +#define BL1_H #include <bl_common.h> @@ -97,4 +97,4 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, meminfo_t *bl2_mem_layout); #endif /* __ASSEMBLY__ */ -#endif /* __BL1_FWU_H__ */ +#endif /* BL1_H */ diff --git a/include/bl1/tbbr/tbbr_img_desc.h b/include/bl1/tbbr/tbbr_img_desc.h index 4063f8a5c..bb36eb50c 100644 --- a/include/bl1/tbbr/tbbr_img_desc.h +++ b/include/bl1/tbbr/tbbr_img_desc.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TBBR_IMG_DESC_H__ -#define __TBBR_IMG_DESC_H__ +#ifndef TBBR_IMG_DESC_H +#define TBBR_IMG_DESC_H #include <bl_common.h> extern image_desc_t bl1_tbbr_image_descs[]; -#endif /* __TBBR_IMG_DESC_H__ */ +#endif /* TBBR_IMG_DESC_H */ diff --git a/include/bl2/bl2.h b/include/bl2/bl2.h index 89ff06eae..8ec080c0a 100644 --- a/include/bl2/bl2.h +++ b/include/bl2/bl2.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef BL2_H__ -#define BL2_H__ +#ifndef BL2_H +#define BL2_H void bl2_main(void); -#endif /* BL2_H__ */ +#endif /* BL2_H */ diff --git a/include/bl2u/bl2u.h b/include/bl2u/bl2u.h index 7017b3ac6..387eaf8d8 100644 --- a/include/bl2u/bl2u.h +++ b/include/bl2u/bl2u.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef BL2_H__ -#define BL2_H__ +#ifndef BL2U_H +#define BL2U_H void bl2u_main(void); -#endif /* BL2_H__ */ +#endif /* BL2U_H */ diff --git a/include/bl31/bl31.h b/include/bl31/bl31.h index 7c35922c3..08c555d90 100644 --- a/include/bl31/bl31.h +++ b/include/bl31/bl31.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __BL31_H__ -#define __BL31_H__ +#ifndef BL31_H +#define BL31_H #include <stdint.h> @@ -21,4 +21,4 @@ void bl31_warm_entrypoint(void); void bl31_main(void); void bl31_lib_init(void); -#endif /* __BL31_H__ */ +#endif /* BL31_H */ diff --git a/include/bl31/ea_handle.h b/include/bl31/ea_handle.h index 060c9b7f0..68f012c14 100644 --- a/include/bl31/ea_handle.h +++ b/include/bl31/ea_handle.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __EA_HANDLE_H__ -#define __EA_HANDLE_H__ +#ifndef EA_HANDLE_H +#define EA_HANDLE_H /* Constants indicating the reason for an External Abort */ @@ -21,4 +21,4 @@ /* RAS event signalled as peripheral interrupt */ #define ERROR_INTERRUPT 3 -#endif /* __EA_HANDLE_H__ */ +#endif /* EA_HANDLE_H */ diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h index 0cdbda02b..6a49fb6dd 100644 --- a/include/bl31/interrupt_mgmt.h +++ b/include/bl31/interrupt_mgmt.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __INTERRUPT_MGMT_H__ -#define __INTERRUPT_MGMT_H__ +#ifndef INTERRUPT_MGMT_H +#define INTERRUPT_MGMT_H #include <arch.h> #include <utils_def.h> @@ -144,4 +144,4 @@ int disable_intr_rm_local(uint32_t type, uint32_t security_state); int enable_intr_rm_local(uint32_t type, uint32_t security_state); #endif /*__ASSEMBLY__*/ -#endif /* __INTERRUPT_MGMT_H__ */ +#endif /* INTERRUPT_MGMT_H */ diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h index 941b6cc0c..0234cbe4d 100644 --- a/include/bl32/payloads/tlk.h +++ b/include/bl32/payloads/tlk.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TLK_H__ -#define __TLK_H__ +#ifndef TLK_H +#define TLK_H #include <utils_def.h> @@ -63,4 +63,4 @@ #define TOS_UID 0xbf00ff01 /* Implementation UID */ #define TOS_CALL_VERSION 0xbf00ff03 /* Trusted OS Call Version */ -#endif /* __TLK_H__ */ +#endif /* TLK_H */ diff --git a/include/bl32/sp_min/platform_sp_min.h b/include/bl32/sp_min/platform_sp_min.h index 2d71a4798..feb4ec371 100644 --- a/include/bl32/sp_min/platform_sp_min.h +++ b/include/bl32/sp_min/platform_sp_min.h @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_SP_MIN_H__ -#define __PLATFORM_SP_MIN_H__ +#ifndef PLATFORM_SP_MIN_H +#define PLATFORM_SP_MIN_H + +#include <stdint.h> /******************************************************************************* * Mandatory SP_MIN functions @@ -20,4 +22,4 @@ entry_point_info_t *sp_min_plat_get_bl33_ep_info(void); /* Platforms that enable SP_MIN_WITH_SECURE_FIQ shall implement this api */ void sp_min_plat_fiq_handler(uint32_t id); -#endif /* __PLATFORM_SP_MIN_H__ */ +#endif /* PLATFORM_SP_MIN_H */ diff --git a/include/bl32/tsp/platform_tsp.h b/include/bl32/tsp/platform_tsp.h index a5a0223c8..fe8a2c933 100644 --- a/include/bl32/tsp/platform_tsp.h +++ b/include/bl32/tsp/platform_tsp.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_TSP_H__ - +#ifndef PLATFORM_TSP_H +#define PLATFORM_TSP_H /******************************************************************************* * Mandatory TSP functions (only if platform contains a TSP) @@ -14,7 +14,4 @@ void tsp_early_platform_setup(void); void tsp_plat_arch_setup(void); void tsp_platform_setup(void); - -#define __PLATFORM_H__ - -#endif +#endif /* PLATFORM_TSP_H */ diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h index 43bba8f5e..ed4792e58 100644 --- a/include/bl32/tsp/tsp.h +++ b/include/bl32/tsp/tsp.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TSP_H__ -#define __TSP_H__ +#ifndef TSP_H +#define TSP_H /* * SMC function IDs that TSP uses to signal various forms of completions @@ -107,4 +107,4 @@ typedef struct tsp_vectors { #endif /* __ASSEMBLY__ */ -#endif /* __TSP_H__ */ +#endif /* TSP_H */ diff --git a/include/common/aarch32/asm_macros.S b/include/common/aarch32/asm_macros.S index f7d0595e1..c54f75c2d 100644 --- a/include/common/aarch32/asm_macros.S +++ b/include/common/aarch32/asm_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ASM_MACROS_S__ -#define __ASM_MACROS_S__ +#ifndef ASM_MACROS_S +#define ASM_MACROS_S #include <arch.h> #include <asm_macros_common.S> @@ -189,4 +189,4 @@ .endif .endm -#endif /* __ASM_MACROS_S__ */ +#endif /* ASM_MACROS_S */ diff --git a/include/common/aarch32/assert_macros.S b/include/common/aarch32/assert_macros.S index c9588106d..ab3a2ebb7 100644 --- a/include/common/aarch32/assert_macros.S +++ b/include/common/aarch32/assert_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ASSERT_MACROS_S__ -#define __ASSERT_MACROS_S__ +#ifndef ASSERT_MACROS_S +#define ASSERT_MACROS_S /* * Assembler macro to enable asm_assert. We assume that the stack is @@ -23,4 +23,4 @@ b asm_assert;\ 300: -#endif /* __ASSERT_MACROS_S__ */ +#endif /* ASSERT_MACROS_S */ diff --git a/include/common/aarch32/console_macros.S b/include/common/aarch32/console_macros.S index 7c30688fb..ba6e7d050 100644 --- a/include/common/aarch32/console_macros.S +++ b/include/common/aarch32/console_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CONSOLE_MACROS_S__ -#define __CONSOLE_MACROS_S__ +#ifndef CONSOLE_MACROS_S +#define CONSOLE_MACROS_S #include <console.h> @@ -81,4 +81,4 @@ b console_register .endm #endif /* USE_FINISH_CONSOLE_REG_2 */ -#endif /* __CONSOLE_MACROS_S__ */ +#endif /* CONSOLE_MACROS_S */ diff --git a/include/common/aarch32/el3_common_macros.S b/include/common/aarch32/el3_common_macros.S index 5db885448..9b18ba38e 100644 --- a/include/common/aarch32/el3_common_macros.S +++ b/include/common/aarch32/el3_common_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __EL3_COMMON_MACROS_S__ -#define __EL3_COMMON_MACROS_S__ +#ifndef EL3_COMMON_MACROS_S +#define EL3_COMMON_MACROS_S #include <arch.h> #include <asm_macros.S> @@ -313,4 +313,4 @@ #endif .endm -#endif /* __EL3_COMMON_MACROS_S__ */ +#endif /* EL3_COMMON_MACROS_S */ diff --git a/include/common/aarch64/asm_macros.S b/include/common/aarch64/asm_macros.S index 91416e4e4..dea302137 100644 --- a/include/common/aarch64/asm_macros.S +++ b/include/common/aarch64/asm_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ASM_MACROS_S__ -#define __ASM_MACROS_S__ +#ifndef ASM_MACROS_S +#define ASM_MACROS_S #include <arch.h> #include <asm_macros_common.S> @@ -192,4 +192,4 @@ .endm #endif -#endif /* __ASM_MACROS_S__ */ +#endif /* ASM_MACROS_S */ diff --git a/include/common/aarch64/assert_macros.S b/include/common/aarch64/assert_macros.S index 4567c69bf..06371c420 100644 --- a/include/common/aarch64/assert_macros.S +++ b/include/common/aarch64/assert_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ASSERT_MACROS_S__ -#define __ASSERT_MACROS_S__ +#ifndef ASSERT_MACROS_S +#define ASSERT_MACROS_S /* * Assembler macro to enable asm_assert. Use this macro wherever @@ -26,4 +26,4 @@ b asm_assert ;\ 300: -#endif /* __ASSERT_MACROS_S__ */ +#endif /* ASSERT_MACROS_S */ diff --git a/include/common/aarch64/console_macros.S b/include/common/aarch64/console_macros.S index b285ecce9..5c88d4f22 100644 --- a/include/common/aarch64/console_macros.S +++ b/include/common/aarch64/console_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CONSOLE_MACROS_S__ -#define __CONSOLE_MACROS_S__ +#ifndef CONSOLE_MACROS_S +#define CONSOLE_MACROS_S #include <console.h> @@ -84,4 +84,5 @@ b console_register .endm #endif /* USE_FINISH_CONSOLE_REG_2 */ -#endif /* __CONSOLE_MACROS_S__ */ + +#endif /* CONSOLE_MACROS_S */ diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S index 4902583b1..adfb54e6f 100644 --- a/include/common/aarch64/el3_common_macros.S +++ b/include/common/aarch64/el3_common_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __EL3_COMMON_MACROS_S__ -#define __EL3_COMMON_MACROS_S__ +#ifndef EL3_COMMON_MACROS_S +#define EL3_COMMON_MACROS_S #include <arch.h> #include <asm_macros.S> @@ -341,4 +341,4 @@ #endif .endm -#endif /* __EL3_COMMON_MACROS_S__ */ +#endif /* EL3_COMMON_MACROS_S */ diff --git a/include/common/asm_macros_common.S b/include/common/asm_macros_common.S index 081addcc5..09742af16 100644 --- a/include/common/asm_macros_common.S +++ b/include/common/asm_macros_common.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ASM_MACROS_COMMON_S__ -#define __ASM_MACROS_COMMON_S__ +#ifndef ASM_MACROS_COMMON_S +#define ASM_MACROS_COMMON_S /* * This macro is used to create a function label and place the @@ -104,4 +104,4 @@ .endm -#endif /* __ASM_MACROS_COMMON_S__ */ +#endif /* ASM_MACROS_COMMON_S */ diff --git a/include/common/bl_common.h b/include/common/bl_common.h index 6a79dc33f..56c89fcc4 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __BL_COMMON_H__ -#define __BL_COMMON_H__ +#ifndef BL_COMMON_H +#define BL_COMMON_H #include <ep_info.h> #include <param_header.h> @@ -201,4 +201,4 @@ void setup_page_tables(const struct mmap_region *bl_regions, #endif /*__ASSEMBLY__*/ -#endif /* __BL_COMMON_H__ */ +#endif /* BL_COMMON_H */ diff --git a/include/common/desc_image_load.h b/include/common/desc_image_load.h index 1ed2b15de..625489519 100644 --- a/include/common/desc_image_load.h +++ b/include/common/desc_image_load.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DESC_IMAGE_LOAD_H__ -#define __DESC_IMAGE_LOAD_H__ +#ifndef DESC_IMAGE_LOAD_H +#define DESC_IMAGE_LOAD_H #include <bl_common.h> @@ -37,4 +37,4 @@ bl_load_info_t *get_bl_load_info_from_mem_params_desc(void); bl_params_t *get_next_bl_params_from_mem_params_desc(void); void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params); -#endif /* __DESC_IMAGE_LOAD_H__ */ +#endif /* DESC_IMAGE_LOAD_H */ diff --git a/include/common/ep_info.h b/include/common/ep_info.h index db2355ab8..0f67687e4 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __EP_INFO_H__ -#define __EP_INFO_H__ +#ifndef EP_INFO_H +#define EP_INFO_H #include <param_header.h> #include <utils_def.h> @@ -132,5 +132,4 @@ CASSERT(sizeof(uintptr_t) == #endif /*__ASSEMBLY__*/ -#endif /* __EP_INFO_H__ */ - +#endif /* EP_INFO_H */ diff --git a/include/common/fdt_wrappers.h b/include/common/fdt_wrappers.h index c8d753f9a..79d001d28 100644 --- a/include/common/fdt_wrappers.h +++ b/include/common/fdt_wrappers.h @@ -6,8 +6,8 @@ /* Helper functions to offer easier navigation of Device Tree Blob */ -#ifndef __FDT_WRAPPERS__ -#define __FDT_WRAPPERS__ +#ifndef FDT_WRAPPERS_H +#define FDT_WRAPPERS_H /* Number of cells, given total length in bytes. Each cell is 4 bytes long */ #define NCELLS(len) ((len) / 4U) @@ -21,4 +21,4 @@ int fdtw_read_string(const void *dtb, int node, const char *prop, int fdtw_write_inplace_cells(void *dtb, int node, const char *prop, unsigned int cells, void *value); -#endif /* __FDT_WRAPPERS__ */ +#endif /* FDT_WRAPPERS_H */ diff --git a/include/common/image_decompress.h b/include/common/image_decompress.h index aed8df306..bb35c3ba7 100644 --- a/include/common/image_decompress.h +++ b/include/common/image_decompress.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMAGE_DECOMPRESS_H__ -#define __IMAGE_DECOMPRESS_H__ +#ifndef IMAGE_DECOMPRESS_H +#define IMAGE_DECOMPRESS_H #include <stddef.h> #include <stdint.h> @@ -21,4 +21,4 @@ void image_decompress_init(uintptr_t buf_base, uint32_t buf_size, void image_decompress_prepare(struct image_info *info); int image_decompress(struct image_info *info); -#endif /* __IMAGE_DECOMPRESS_H___ */ +#endif /* IMAGE_DECOMPRESS_H */ diff --git a/include/common/interrupt_props.h b/include/common/interrupt_props.h index 4ac698dfc..6c6a85361 100644 --- a/include/common/interrupt_props.h +++ b/include/common/interrupt_props.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __INTERRUPT_PROPS_H__ -#define __INTERRUPT_PROPS_H__ +#ifndef INTERRUPT_PROPS_H +#define INTERRUPT_PROPS_H #ifndef __ASSEMBLY__ @@ -26,4 +26,4 @@ typedef struct interrupt_prop { } interrupt_prop_t; #endif /* __ASSEMBLY__ */ -#endif /* __INTERRUPT_PROPS_H__ */ +#endif /* INTERRUPT_PROPS_H */ diff --git a/include/common/param_header.h b/include/common/param_header.h index ec4ee4ee1..e9717cbca 100644 --- a/include/common/param_header.h +++ b/include/common/param_header.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PARAM_HEADER_H__ -#define __PARAM_HEADER_H__ +#ifndef PARAM_HEADER_H +#define PARAM_HEADER_H #include <stdbool.h> #include <utils_def.h> @@ -54,5 +54,4 @@ typedef struct param_header { #endif /*__ASSEMBLY__*/ -#endif /* __PARAM_HEADER_H__ */ - +#endif /* PARAM_HEADER_H */ diff --git a/include/common/romlib.h b/include/common/romlib.h index 81a6f5c1e..7f53c4757 100644 --- a/include/common/romlib.h +++ b/include/common/romlib.h @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ROMLIB_H_ +#ifndef ROMLIB_H +#define ROMLIB_H #define ROMLIB_MAJOR 0 #define ROMLIB_MINOR 1 @@ -12,4 +13,4 @@ int rom_lib_init(int version); -#endif +#endif /* ROMLIB_H */ diff --git a/include/common/tbbr/cot_def.h b/include/common/tbbr/cot_def.h index 4a2a8ef54..33350a0d3 100644 --- a/include/common/tbbr/cot_def.h +++ b/include/common/tbbr/cot_def.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __COT_DEF_H__ -#define __COT_DEF_H__ +#ifndef COT_DEF_H +#define COT_DEF_H /* TBBR CoT definitions */ #define COT_MAX_VERIFIED_PARAMS 4 -#endif /* __COT_DEF_H__ */ +#endif /* COT_DEF_H */ diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index 96bfb5341..bd8f5dc58 100644 --- a/include/common/tbbr/tbbr_img_def.h +++ b/include/common/tbbr/tbbr_img_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TBBR_IMG_DEF_H__ -#define __TBBR_IMG_DEF_H__ +#ifndef TBBR_IMG_DEF_H +#define TBBR_IMG_DEF_H #include <utils_def.h> @@ -86,4 +86,4 @@ /* Define size of the array */ #define MAX_NUMBER_IDS U(30) -#endif /* __TBBR_IMG_DEF_H__ */ +#endif /* TBBR_IMG_DEF_H */ diff --git a/include/drivers/allwinner/sunxi_rsb.h b/include/drivers/allwinner/sunxi_rsb.h index 5a69d35f2..3d003cee7 100644 --- a/include/drivers/allwinner/sunxi_rsb.h +++ b/include/drivers/allwinner/sunxi_rsb.h @@ -17,4 +17,4 @@ int rsb_assign_runtime_address(uint16_t hw_addr, uint8_t rt_addr); int rsb_read(uint8_t rt_addr, uint8_t reg_addr); int rsb_write(uint8_t rt_addr, uint8_t reg_addr, uint8_t value); -#endif +#endif /* SUNXI_RSB_H */ diff --git a/include/drivers/arm/arm_gicv3_common.h b/include/drivers/arm/arm_gicv3_common.h index 8970e3f41..b88b59fbf 100644 --- a/include/drivers/arm/arm_gicv3_common.h +++ b/include/drivers/arm/arm_gicv3_common.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARM_GICV3_COMMON_H__ -#define __ARM_GICV3_COMMON_H__ +#ifndef ARM_GICV3_COMMON_H +#define ARM_GICV3_COMMON_H /******************************************************************************* * GIC500/GIC600 Re-distributor interface registers & constants @@ -17,4 +17,4 @@ #define WAKER_SL_BIT (1U << WAKER_SL_SHIFT) #define WAKER_QSC_BIT (1U << WAKER_QSC_SHIFT) -#endif /* __ARM_GICV3_COMMON_H__ */ +#endif /* ARM_GICV3_COMMON_H */ diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h index 41a3de257..24b76dab8 100644 --- a/include/drivers/arm/cci.h +++ b/include/drivers/arm/cci.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CCI_H__ -#define __CCI_H__ +#ifndef CCI_H +#define CCI_H #include <utils_def.h> @@ -122,4 +122,4 @@ void cci_enable_snoop_dvm_reqs(unsigned int master_id); void cci_disable_snoop_dvm_reqs(unsigned int master_id); #endif /* __ASSEMBLY__ */ -#endif /* __CCI_H__ */ +#endif /* CCI_H */ diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h index d74086775..eba974d2f 100644 --- a/include/drivers/arm/ccn.h +++ b/include/drivers/arm/ccn.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CCN_H__ -#define __CCN_H__ +#ifndef CCN_H +#define CCN_H /* * This macro defines the maximum number of master interfaces that reside on @@ -93,4 +93,4 @@ unsigned int ccn_get_l3_run_mode(void); int ccn_get_part0_id(uintptr_t periphbase); #endif /* __ASSEMBLY__ */ -#endif /* __CCN_H__ */ +#endif /* CCN_H */ diff --git a/include/drivers/arm/gic_common.h b/include/drivers/arm/gic_common.h index 0ef114833..2f5334f86 100644 --- a/include/drivers/arm/gic_common.h +++ b/include/drivers/arm/gic_common.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GIC_COMMON_H__ -#define __GIC_COMMON_H__ +#ifndef GIC_COMMON_H +#define GIC_COMMON_H #include <utils_def.h> @@ -100,4 +100,4 @@ (GIC_HIGHEST_NS_PRIORITY << 16) | \ (GIC_HIGHEST_NS_PRIORITY << 24)) -#endif /* __GIC_COMMON_H__ */ +#endif /* GIC_COMMON_H */ diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index c80f80b69..705077ce3 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GICV2_H__ -#define __GICV2_H__ +#ifndef GICV2_H +#define GICV2_H #include <gic_common.h> @@ -184,4 +184,4 @@ unsigned int gicv2_set_pmr(unsigned int mask); void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg); #endif /* __ASSEMBLY__ */ -#endif /* __GICV2_H__ */ +#endif /* GICV2_H */ diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index 9c291eb3f..c26f2975a 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GICV3_H__ -#define __GICV3_H__ +#ifndef GICV3_H +#define GICV3_H /******************************************************************************* * GICv3 miscellaneous definitions @@ -405,4 +405,4 @@ void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num); unsigned int gicv3_set_pmr(unsigned int mask); #endif /* __ASSEMBLY__ */ -#endif /* __GICV3_H__ */ +#endif /* GICV3_H */ diff --git a/include/drivers/arm/nic_400.h b/include/drivers/arm/nic_400.h index 740f184d6..bb749824d 100644 --- a/include/drivers/arm/nic_400.h +++ b/include/drivers/arm/nic_400.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __NIC_400_H__ -#define __NIC_400_H__ +#ifndef NIC_400_H +#define NIC_400_H /* * Address of slave 'n' security setting in the NIC-400 address region @@ -13,4 +13,4 @@ */ #define NIC400_ADDR_CTRL_SECURITY_REG(n) (0x8 + (n) * 4) -#endif /* __NIC_400_H__ */ +#endif /* NIC_400_H */ diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index 137764d3e..6216a61fc 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PL011_H__ -#define __PL011_H__ +#ifndef PL011_H +#define PL011_H #include <console.h> @@ -103,4 +103,4 @@ int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, #endif /*__ASSEMBLY__*/ -#endif /* __PL011_H__ */ +#endif /* PL011_H */ diff --git a/include/drivers/arm/pl061_gpio.h b/include/drivers/arm/pl061_gpio.h index 971a23dab..6c4a9f5a5 100644 --- a/include/drivers/arm/pl061_gpio.h +++ b/include/drivers/arm/pl061_gpio.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PL061_GPIO_H__ -#define __PL061_GPIO_H__ +#ifndef PL061_GPIO_H +#define PL061_GPIO_H #include <gpio.h> void pl061_gpio_register(uintptr_t base_addr, int gpio_dev); void pl061_gpio_init(void); -#endif /* __PL061_GPIO_H__ */ +#endif /* PL061_GPIO_H */ diff --git a/include/drivers/arm/smmu_v3.h b/include/drivers/arm/smmu_v3.h index e3912e31d..1b7ffb8db 100644 --- a/include/drivers/arm/smmu_v3.h +++ b/include/drivers/arm/smmu_v3.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMMU_V3_H__ -#define __SMMU_V3_H__ +#ifndef SMMU_V3_H +#define SMMU_V3_H -#include <utils_def.h> #include <stdint.h> +#include <utils_def.h> /* SMMUv3 register offsets from device base */ #define SMMU_S_IDR1 U(0x8004) @@ -24,4 +24,4 @@ int smmuv3_init(uintptr_t smmu_base); -#endif /* __SMMU_V3_H__ */ +#endif /* SMMU_V3_H */ diff --git a/include/drivers/arm/sp804_delay_timer.h b/include/drivers/arm/sp804_delay_timer.h index 0cf168b6e..8eb8715ae 100644 --- a/include/drivers/arm/sp804_delay_timer.h +++ b/include/drivers/arm/sp804_delay_timer.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SP804_DELAY_TIMER_H__ -#define __SP804_DELAY_TIMER_H__ +#ifndef SP804_DELAY_TIMER_H +#define SP804_DELAY_TIMER_H #include <delay_timer.h> #include <stdint.h> @@ -25,4 +25,4 @@ void sp804_timer_ops_init(uintptr_t base_addr, const timer_ops_t *ops); sp804_timer_ops_init((base_addr), &sp804_timer_ops); \ } while (0) -#endif /* __SP804_DELAY_TIMER_H__ */ +#endif /* SP804_DELAY_TIMER_H */ diff --git a/include/drivers/auth/auth_common.h b/include/drivers/auth/auth_common.h index 058375f79..e6859fdb6 100644 --- a/include/drivers/auth/auth_common.h +++ b/include/drivers/auth/auth_common.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __AUTH_COMMON_H__ -#define __AUTH_COMMON_H__ +#ifndef AUTH_COMMON_H +#define AUTH_COMMON_H /* * Authentication framework common types @@ -117,4 +117,4 @@ typedef struct auth_method_desc_s { .len = (unsigned int)_len \ } -#endif /* __AUTH_COMMON_H__ */ +#endif /* AUTH_COMMON_H */ diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index bb3b8f902..19bc2f135 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __AUTH_MOD_H__ -#define __AUTH_MOD_H__ +#ifndef AUTH_MOD_H +#define AUTH_MOD_H #if TRUSTED_BOARD_BOOT @@ -49,4 +49,4 @@ extern unsigned int auth_img_flags[MAX_NUMBER_IDS]; #endif /* TRUSTED_BOARD_BOOT */ -#endif /* __AUTH_MOD_H__ */ +#endif /* AUTH_MOD_H */ diff --git a/include/drivers/auth/crypto_mod.h b/include/drivers/auth/crypto_mod.h index f9b44d1c0..3a4210569 100644 --- a/include/drivers/auth/crypto_mod.h +++ b/include/drivers/auth/crypto_mod.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CRYPTO_MOD_H__ -#define __CRYPTO_MOD_H__ +#ifndef CRYPTO_MOD_H +#define CRYPTO_MOD_H /* Return values */ enum crypto_ret_value { @@ -59,4 +59,4 @@ int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len, extern const crypto_lib_desc_t crypto_lib_desc; -#endif /* __CRYPTO_MOD_H__ */ +#endif /* CRYPTO_MOD_H */ diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h index eaf3e6e7a..43796935a 100644 --- a/include/drivers/auth/img_parser_mod.h +++ b/include/drivers/auth/img_parser_mod.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMG_PARSER_MOD_H__ -#define __IMG_PARSER_MOD_H__ +#ifndef IMG_PARSER_MOD_H +#define IMG_PARSER_MOD_H #include <auth_common.h> @@ -61,4 +61,4 @@ int img_parser_get_auth_param(img_type_t img_type, .get_auth_param = _get_param \ } -#endif /* __IMG_PARSER_MOD_H__ */ +#endif /* IMG_PARSER_MOD_H */ diff --git a/include/drivers/auth/mbedtls/mbedtls_common.h b/include/drivers/auth/mbedtls/mbedtls_common.h index 5d3e1986d..a9c2352e2 100644 --- a/include/drivers/auth/mbedtls/mbedtls_common.h +++ b/include/drivers/auth/mbedtls/mbedtls_common.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MBEDTLS_COMMON_H__ -#define __MBEDTLS_COMMON_H__ +#ifndef MBEDTLS_COMMON_H +#define MBEDTLS_COMMON_H void mbedtls_init(void); -#endif /* __MBEDTLS_COMMON_H__ */ +#endif /* MBEDTLS_COMMON_H */ diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index cc57b7798..d143d7351 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MBEDTLS_CONFIG_H__ -#define __MBEDTLS_CONFIG_H__ +#ifndef MBEDTLS_CONFIG_H +#define MBEDTLS_CONFIG_H /* * Key algorithms currently supported on mbed TLS libraries @@ -104,4 +104,4 @@ #define TF_MBEDTLS_HEAP_SIZE U(7168) #endif -#endif /* __MBEDTLS_CONFIG_H__ */ +#endif /* MBEDTLS_CONFIG_H */ diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h index 51de8e3d5..f92d9fbed 100644 --- a/include/drivers/cadence/cdns_uart.h +++ b/include/drivers/cadence/cdns_uart.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CADENCE_UART_H__ -#define __CADENCE_UART_H__ +#ifndef CDNS_UART_H +#define CDNS_UART_H #include <console.h> @@ -47,4 +47,4 @@ int console_cdns_register(uint64_t baseaddr, uint32_t clock, uint32_t baud, #endif /*__ASSEMBLY__*/ -#endif +#endif /* CDNS_UART_H */ diff --git a/include/drivers/cfi/v2m_flash.h b/include/drivers/cfi/v2m_flash.h index 5763b36df..6beec5016 100644 --- a/include/drivers/cfi/v2m_flash.h +++ b/include/drivers/cfi/v2m_flash.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __NORFLASH_H_ -#define __NORFLASH_H_ +#ifndef V2M_FLASH_H +#define V2M_FLASH_H #include <stdint.h> @@ -42,5 +42,4 @@ int nor_lock(uintptr_t base_addr); int nor_unlock(uintptr_t base_addr); int nor_erase(uintptr_t base_addr); -#endif /* __NORFLASH_H_ */ - +#endif /* V2M_FLASH_H*/ diff --git a/include/drivers/console.h b/include/drivers/console.h index 1f041b97b..23754665c 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CONSOLE_H__ -#define __CONSOLE_H__ +#ifndef CONSOLE_H +#define CONSOLE_H #include <utils_def.h> @@ -80,5 +80,4 @@ void console_uninit(void); #endif /* __ASSEMBLY__ */ -#endif /* __CONSOLE_H__ */ - +#endif /* CONSOLE_H */ diff --git a/include/drivers/console_assertions.h b/include/drivers/console_assertions.h index cedce8679..559bb5096 100644 --- a/include/drivers/console_assertions.h +++ b/include/drivers/console_assertions.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CONSOLE_ASSERTIONS_H__ -#define __CONSOLE_ASSERTIONS_H__ +#ifndef CONSOLE_ASSERTIONS_H +#define CONSOLE_ASSERTIONS_H #include <cassert.h> @@ -26,5 +26,4 @@ CASSERT(CONSOLE_T_FLUSH == __builtin_offsetof(console_t, flush), CASSERT(CONSOLE_T_DRVDATA == sizeof(console_t), assert_console_t_drvdata_offset_mismatch); -#endif /* __CONSOLE_ASSERTIONS_H__ */ - +#endif /* CONSOLE_ASSERTIONS_H */ diff --git a/include/drivers/coreboot/cbmem_console.h b/include/drivers/coreboot/cbmem_console.h index 4fca36f61..7fe7a72da 100644 --- a/include/drivers/coreboot/cbmem_console.h +++ b/include/drivers/coreboot/cbmem_console.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CBMEM_CONSOLE_H__ -#define __CBMEM_CONSOLE_H__ +#ifndef CBMEM_CONSOLE_H +#define CBMEM_CONSOLE_H #include <console.h> @@ -24,4 +24,4 @@ int console_cbmc_register(uintptr_t base, console_cbmc_t *console); #endif /* __ASSEMBLER__ */ -#endif /* __CBMEM_CONSOLE_H__ */ +#endif /* CBMEM_CONSOLE_H */ diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h index b28f619b1..684f1c3c3 100644 --- a/include/drivers/delay_timer.h +++ b/include/drivers/delay_timer.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DELAY_TIMER_H__ -#define __DELAY_TIMER_H__ +#ifndef DELAY_TIMER_H +#define DELAY_TIMER_H #include <stdint.h> @@ -27,5 +27,4 @@ void mdelay(uint32_t msec); void udelay(uint32_t usec); void timer_init(const timer_ops_t *ops_ptr); - -#endif /* __DELAY_TIMER_H__ */ +#endif /* DELAY_TIMER_H */ diff --git a/include/drivers/dw_ufs.h b/include/drivers/dw_ufs.h index a9774cf18..13e53f140 100644 --- a/include/drivers/dw_ufs.h +++ b/include/drivers/dw_ufs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DW_UFS_H__ -#define __DW_UFS_H__ +#ifndef DW_UFS_H +#define DW_UFS_H #include <stdint.h> @@ -107,4 +107,4 @@ typedef struct dw_ufs_params { int dw_ufs_init(dw_ufs_params_t *params); -#endif /* __DW_UFS_H__ */ +#endif /* DW_UFS_H */ diff --git a/include/drivers/generic_delay_timer.h b/include/drivers/generic_delay_timer.h index 1c53a72db..adba10f83 100644 --- a/include/drivers/generic_delay_timer.h +++ b/include/drivers/generic_delay_timer.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GENERIC_DELAY_TIMER_H__ -#define __GENERIC_DELAY_TIMER_H__ +#ifndef GENERIC_DELAY_TIMER_H +#define GENERIC_DELAY_TIMER_H #include <stdint.h> @@ -13,4 +13,4 @@ void generic_delay_timer_init_args(uint32_t mult, uint32_t div); void generic_delay_timer_init(void); -#endif /* __GENERIC_DELAY_TIMER_H__ */ +#endif /* GENERIC_DELAY_TIMER_H */ diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h index 5722051f5..bef62f73b 100644 --- a/include/drivers/gpio.h +++ b/include/drivers/gpio.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GPIO_H__ -#define __GPIO_H__ +#ifndef GPIO_H +#define GPIO_H #define GPIO_DIR_OUT 0 #define GPIO_DIR_IN 1 @@ -34,4 +34,4 @@ void gpio_set_pull(int gpio, int pull); int gpio_get_pull(int gpio); void gpio_init(const gpio_ops_t *ops); -#endif /* __GPIO_H__ */ +#endif /* GPIO_H */ diff --git a/include/drivers/io/io_block.h b/include/drivers/io/io_block.h index 4f3ab39d4..d6d32f9b7 100644 --- a/include/drivers/io/io_block.h +++ b/include/drivers/io/io_block.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_BLOCK_H__ -#define __IO_BLOCK_H__ +#ifndef IO_BLOCK_H +#define IO_BLOCK_H #include <io_storage.h> @@ -25,4 +25,4 @@ struct io_dev_connector; int register_io_dev_block(const struct io_dev_connector **dev_con); -#endif /* __IO_BLOCK_H__ */ +#endif /* IO_BLOCK_H */ diff --git a/include/drivers/io/io_driver.h b/include/drivers/io/io_driver.h index 8306407b3..587f137c5 100644 --- a/include/drivers/io/io_driver.h +++ b/include/drivers/io/io_driver.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_DRIVER_H__ -#define __IO_DRIVER_H__ +#ifndef IO_DRIVER_H +#define IO_DRIVER_H #include <io_storage.h> #include <stdint.h> @@ -56,4 +56,4 @@ typedef struct io_dev_funcs { /* Register an IO device */ int io_register_device(const io_dev_info_t *dev_info); -#endif /* __IO_DRIVER_H__ */ +#endif /* IO_DRIVER_H */ diff --git a/include/drivers/io/io_dummy.h b/include/drivers/io/io_dummy.h index abe77eca8..edfc6993e 100644 --- a/include/drivers/io/io_dummy.h +++ b/include/drivers/io/io_dummy.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_DUMMY_H__ -#define __IO_DUMMY_H__ +#ifndef IO_DUMMY_H +#define IO_DUMMY_H int register_io_dev_dummy(const struct io_dev_connector **dev_con); -#endif /* __IO_DUMMY_H__ */ +#endif /* IO_DUMMY_H */ diff --git a/include/drivers/io/io_fip.h b/include/drivers/io/io_fip.h index 1131cc7da..e0b57463f 100644 --- a/include/drivers/io/io_fip.h +++ b/include/drivers/io/io_fip.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_FIP_H__ -#define __IO_FIP_H__ +#ifndef IO_FIP_H +#define IO_FIP_H struct io_dev_connector; int register_io_dev_fip(const struct io_dev_connector **dev_con); -#endif /* __IO_FIP_H__ */ +#endif /* IO_FIP_H */ diff --git a/include/drivers/io/io_memmap.h b/include/drivers/io/io_memmap.h index 70e4e5574..87e346624 100644 --- a/include/drivers/io/io_memmap.h +++ b/include/drivers/io/io_memmap.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_MEMMAP_H__ -#define __IO_MEMMAP_H__ +#ifndef IO_MEMMAP_H +#define IO_MEMMAP_H struct io_dev_connector; int register_io_dev_memmap(const struct io_dev_connector **dev_con); -#endif /* __IO_MEMMAP_H__ */ +#endif /* IO_MEMMAP_H */ diff --git a/include/drivers/io/io_semihosting.h b/include/drivers/io/io_semihosting.h index a917f5a6b..e90ea5c0f 100644 --- a/include/drivers/io/io_semihosting.h +++ b/include/drivers/io/io_semihosting.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_SH_H__ -#define __IO_SH_H__ +#ifndef IO_SEMIHOSTING_H +#define IO_SEMIHOSTING_H struct io_dev_connector; int register_io_dev_sh(const struct io_dev_connector **dev_con); -#endif /* __IO_SH_H__ */ +#endif /* IO_SEMIHOSTING_H */ diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h index 02308e3a2..c496d487e 100644 --- a/include/drivers/io/io_storage.h +++ b/include/drivers/io/io_storage.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IO_H__ -#define __IO_H__ +#ifndef IO_STORAGE_H +#define IO_STORAGE_H #include <errno.h> #include <stdint.h> @@ -101,4 +101,4 @@ int io_write(uintptr_t handle, const uintptr_t buffer, size_t length, int io_close(uintptr_t handle); -#endif /* __IO_H__ */ +#endif /* IO_STORAGE_H */ diff --git a/include/drivers/marvell/addr_map.h b/include/drivers/marvell/addr_map.h index 6b957a165..0d219f2ed 100644 --- a/include/drivers/marvell/addr_map.h +++ b/include/drivers/marvell/addr_map.h @@ -7,8 +7,8 @@ /* Address map types for Marvell address translation unit drivers */ -#ifndef _ADDR_MAP_H_ -#define _ADDR_MAP_H_ +#ifndef ADDR_MAP_H +#define ADDR_MAP_H #include <stdint.h> @@ -18,4 +18,4 @@ struct addr_map_win { uint32_t target_id; }; -#endif /* _ADDR_MAP_H_ */ +#endif /* ADDR_MAP_H */ diff --git a/include/drivers/marvell/amb_adec.h b/include/drivers/marvell/amb_adec.h index 087864a45..a92db5beb 100644 --- a/include/drivers/marvell/amb_adec.h +++ b/include/drivers/marvell/amb_adec.h @@ -7,8 +7,8 @@ /* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */ -#ifndef _AMB_ADEC_H_ -#define _AMB_ADEC_H_ +#ifndef AMB_ADEC_H +#define AMB_ADEC_H #include <stdint.h> @@ -33,4 +33,4 @@ enum amb_attribute_ids { int init_amb_adec(uintptr_t base); -#endif /* _AMB_ADEC_H_ */ +#endif /* AMB_ADEC_H */ diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h index 37e211f0f..c16f62538 100644 --- a/include/drivers/marvell/aro.h +++ b/include/drivers/marvell/aro.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ -#ifndef _ARO_H_ -#define _ARO_H_ +#ifndef ARO_H +#define ARO_H enum hws_freq { CPU_FREQ_2000, @@ -44,4 +44,4 @@ enum cpu_clock_freq_mode { int init_aro(void); -#endif /* _ARO_H_ */ +#endif /* ARO_H */ diff --git a/include/drivers/marvell/cache_llc.h b/include/drivers/marvell/cache_llc.h index 9e4179397..1aa4c889e 100644 --- a/include/drivers/marvell/cache_llc.h +++ b/include/drivers/marvell/cache_llc.h @@ -9,8 +9,8 @@ * for Marvell SoCs in AP806, AP807, and AP810 */ -#ifndef _CACHE_LLC_H_ -#define _CACHE_LLC_H_ +#ifndef CACHE_LLC_H +#define CACHE_LLC_H #define LLC_CTRL(ap) (MVEBU_LLC_BASE(ap) + 0x100) #define LLC_SYNC(ap) (MVEBU_LLC_BASE(ap) + 0x700) @@ -38,5 +38,4 @@ int llc_is_exclusive(int ap_index); void llc_runtime_enable(int ap_index); #endif -#endif /* _CACHE_LLC_H_ */ - +#endif /* CACHE_LLC_H */ diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h index ff30a76a9..2757765bc 100644 --- a/include/drivers/marvell/ccu.h +++ b/include/drivers/marvell/ccu.h @@ -7,8 +7,8 @@ /* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */ -#ifndef _CCU_H_ -#define _CCU_H_ +#ifndef CCU_H +#define CCU_H #ifndef __ASSEMBLY__ #include <addr_map.h> @@ -48,4 +48,4 @@ void ccu_save_win_all(int ap_id); void ccu_restore_win_all(int ap_id); #endif -#endif /* _CCU_H_ */ +#endif /* CCU_H */ diff --git a/include/drivers/marvell/gwin.h b/include/drivers/marvell/gwin.h index 5dc9f244e..6b7f1752f 100644 --- a/include/drivers/marvell/gwin.h +++ b/include/drivers/marvell/gwin.h @@ -7,8 +7,8 @@ /* GWIN unit device driver for Marvell AP810 SoC */ -#ifndef _GWIN_H_ -#define _GWIN_H_ +#ifndef GWIN_H +#define GWIN_H #include <addr_map.h> @@ -16,4 +16,4 @@ int init_gwin(int ap_index); void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size); void gwin_temp_win_remove(int ap_index, struct addr_map_win *win, int size); -#endif /* _GWIN_H_ */ +#endif /* GWIN_H */ diff --git a/include/drivers/marvell/i2c.h b/include/drivers/marvell/i2c.h index bd1438526..06c5114bf 100644 --- a/include/drivers/marvell/i2c.h +++ b/include/drivers/marvell/i2c.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef _I2C_H_ -#define _I2C_H_ +#ifndef I2C_H +#define I2C_H void i2c_init(void); @@ -16,4 +16,5 @@ int i2c_read(uint8_t chip, int i2c_write(uint8_t chip, unsigned int addr, int alen, uint8_t *buffer, int len); -#endif + +#endif /* I2C_H */ diff --git a/include/drivers/marvell/io_win.h b/include/drivers/marvell/io_win.h index 4102a11a5..45e86666a 100644 --- a/include/drivers/marvell/io_win.h +++ b/include/drivers/marvell/io_win.h @@ -7,8 +7,8 @@ /* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */ -#ifndef _IO_WIN_H_ -#define _IO_WIN_H_ +#ifndef IO_WIN_H +#define IO_WIN_H #include <addr_map.h> @@ -18,4 +18,4 @@ void iow_temp_win_remove(int ap_index, struct addr_map_win *win, int size); void iow_save_win_all(int ap_id); void iow_restore_win_all(int ap_id); -#endif /* _IO_WIN_H_ */ +#endif /* IO_WIN_H */ diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h index 9848c0ab3..ccbdf960d 100644 --- a/include/drivers/marvell/iob.h +++ b/include/drivers/marvell/iob.h @@ -7,8 +7,8 @@ /* IOW unit device driver for Marvell CP110 and CP115 SoCs */ -#ifndef _IOB_H_ -#define _IOB_H_ +#ifndef IOB_H +#define IOB_H #include <addr_map.h> @@ -28,4 +28,4 @@ int init_iob(uintptr_t base); void iob_cfg_space_update(int ap_idx, int cp_idx, uintptr_t base, uintptr_t new_base); -#endif /* _IOB_H_ */ +#endif /* IOB_H */ diff --git a/include/drivers/marvell/mci.h b/include/drivers/marvell/mci.h index 789b3b961..8ef023459 100644 --- a/include/drivers/marvell/mci.h +++ b/include/drivers/marvell/mci.h @@ -7,12 +7,12 @@ /* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */ -#ifndef _MCI_H_ -#define _MCI_H_ +#ifndef MCI_H +#define MCI_H int mci_initialize(int mci_index); void mci_turn_link_down(void); void mci_turn_link_on(void); int mci_get_link_status(void); -#endif /* _MCI_H_ */ +#endif /* MCI_H */ diff --git a/include/drivers/marvell/mochi/ap_setup.h b/include/drivers/marvell/mochi/ap_setup.h index 41f2bac35..eff447325 100644 --- a/include/drivers/marvell/mochi/ap_setup.h +++ b/include/drivers/marvell/mochi/ap_setup.h @@ -7,11 +7,11 @@ /* AP8xx Marvell SoC driver */ -#ifndef __AP_SETUP_H__ -#define __AP_SETUP_H__ +#ifndef AP_SETUP_H +#define AP_SETUP_H void ap_init(void); void ap_ble_init(void); int ap_get_count(void); -#endif /* __AP_SETUP_H__ */ +#endif /* AP_SETUP_H */ diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 839efe1ba..18d9f1810 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -7,8 +7,8 @@ /* CP110 Marvell SoC driver */ -#ifndef __CP110_SETUP_H__ -#define __CP110_SETUP_H__ +#ifndef CP110_SETUP_H +#define CP110_SETUP_H #include <mmio.h> #include <mvebu_def.h> @@ -51,4 +51,4 @@ static inline uint32_t cp110_rev_id_get(uintptr_t base) void cp110_init(uintptr_t cp110_base, uint32_t stream_id); void cp110_ble_init(uintptr_t cp110_base); -#endif /* __CP110_SETUP_H__ */ +#endif /* CP110_SETUP_H */ diff --git a/include/drivers/marvell/thermal.h b/include/drivers/marvell/thermal.h index 191f97bab..48376a790 100644 --- a/include/drivers/marvell/thermal.h +++ b/include/drivers/marvell/thermal.h @@ -7,8 +7,8 @@ /* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */ -#ifndef _THERMAL_H -#define _THERMAL_H +#ifndef THERMAL_H +#define THERMAL_H struct tsen_config { /* thermal temperature parameters */ @@ -28,4 +28,4 @@ int marvell_thermal_init(struct tsen_config *tsen_cfg); int marvell_thermal_read(struct tsen_config *tsen_cfg, int *temp); struct tsen_config *marvell_thermal_config_get(void); -#endif /* _THERMAL_H */ +#endif /* THERMAL_H */ diff --git a/include/drivers/mentor/mi2cv.h b/include/drivers/mentor/mi2cv.h index 6b03ed7f6..85b733bd6 100644 --- a/include/drivers/mentor/mi2cv.h +++ b/include/drivers/mentor/mi2cv.h @@ -8,8 +8,8 @@ /* This driver provides support for Mentor Graphics MI2CV IP core */ -#ifndef _MI2CV_H_ -#define _MI2CV_H_ +#ifndef MI2CV_H +#define MI2CV_H #include <stdint.h> @@ -36,4 +36,5 @@ int i2c_read(uint8_t chip, int i2c_write(uint8_t chip, unsigned int addr, int alen, uint8_t *buffer, int len); -#endif + +#endif /* MI2CV_H */ diff --git a/include/drivers/mmc.h b/include/drivers/mmc.h index 9900630e7..a62928bc6 100644 --- a/include/drivers/mmc.h +++ b/include/drivers/mmc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MMC_H__ -#define __MMC_H__ +#ifndef MMC_H +#define MMC_H #include <stdint.h> #include <utils_def.h> @@ -232,4 +232,4 @@ int mmc_init(const struct mmc_ops *ops_ptr, unsigned int clk, unsigned int width, unsigned int flags, struct mmc_device_info *device_info); -#endif /* __MMC_H__ */ +#endif /* MMC_H */ diff --git a/include/drivers/partition/gpt.h b/include/drivers/partition/gpt.h index 7a22d9e23..7984e4d80 100644 --- a/include/drivers/partition/gpt.h +++ b/include/drivers/partition/gpt.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __GPT_H__ -#define __GPT_H__ +#ifndef GPT_H +#define GPT_H #include <partition.h> @@ -48,4 +48,4 @@ typedef struct gpt_header { int parse_gpt_entry(gpt_entry_t *gpt_entry, partition_entry_t *entry); -#endif /* __GPT_H__ */ +#endif /* GPT_H */ diff --git a/include/drivers/partition/mbr.h b/include/drivers/partition/mbr.h index 1cacb7826..1452c0289 100644 --- a/include/drivers/partition/mbr.h +++ b/include/drivers/partition/mbr.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MBR_H__ -#define __MBR_H__ +#ifndef MBR_H +#define MBR_H #define MBR_OFFSET 0 @@ -26,4 +26,4 @@ typedef struct mbr_entry { unsigned int sector_nums; } mbr_entry_t; -#endif /* __MBR_H__ */ +#endif /* MBR_H */ diff --git a/include/drivers/partition/partition.h b/include/drivers/partition/partition.h index 047c7ddaa..2aeaace9f 100644 --- a/include/drivers/partition/partition.h +++ b/include/drivers/partition/partition.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PARTITION_H__ -#define __PARTITION_H__ +#ifndef PARTITION_H +#define PARTITION_H #include <cassert.h> #include <stdint.h> @@ -36,4 +36,4 @@ const partition_entry_t *get_partition_entry(const char *name); const partition_entry_list_t *get_partition_entry_list(void); void partition_init(unsigned int image_id); -#endif /* __PARTITION_H__ */ +#endif /* PARTITION_H */ diff --git a/include/drivers/st/stm32_gpio.h b/include/drivers/st/stm32_gpio.h index 7a5ccd376..938922b48 100644 --- a/include/drivers/st/stm32_gpio.h +++ b/include/drivers/st/stm32_gpio.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_GPIO_H__ -#define __PLAT_GPIO_H__ +#ifndef STM32_GPIO_H +#define STM32_GPIO_H #include <utils_def.h> @@ -98,4 +98,4 @@ void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed, uint32_t pull, uint32_t alternate); #endif /*__ASSEMBLY__*/ -#endif /*__PLAT_GPIO_H__*/ +#endif /* STM32_GPIO_H */ diff --git a/include/drivers/st/stm32_i2c.h b/include/drivers/st/stm32_i2c.h index 29b9d3441..4760c00fe 100644 --- a/include/drivers/st/stm32_i2c.h +++ b/include/drivers/st/stm32_i2c.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_I2C_H -#define __STM32MP1_I2C_H +#ifndef STM32_I2C_H +#define STM32_I2C_H #include <stdint.h> #include <utils_def.h> @@ -297,4 +297,4 @@ int stm32_i2c_is_device_ready(struct i2c_handle_s *hi2c, uint16_t dev_addr, int stm32_i2c_config_analog_filter(struct i2c_handle_s *hi2c, uint32_t analog_filter); -#endif /* __STM32MP1_I2C_H */ +#endif /* STM32_I2C_H */ diff --git a/include/drivers/st/stm32mp1_clk.h b/include/drivers/st/stm32mp1_clk.h index 85a1eb8fd..c89551725 100644 --- a/include/drivers/st/stm32mp1_clk.h +++ b/include/drivers/st/stm32mp1_clk.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_CLK_H__ -#define __STM32MP1_CLK_H__ +#ifndef STM32MP1_CLK_H +#define STM32MP1_CLK_H #include <arch_helpers.h> #include <stdbool.h> @@ -27,4 +27,4 @@ static inline uint32_t get_timer(uint32_t base) return base - (uint32_t)(~read_cntpct_el0()); } -#endif /* __STM32MP1_CLK_H__ */ +#endif /* STM32MP1_CLK_H */ diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h index 635a9cd4c..b11ccf860 100644 --- a/include/drivers/st/stm32mp1_clkfunc.h +++ b/include/drivers/st/stm32mp1_clkfunc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_CLKFUNC_H__ -#define __STM32MP1_CLKFUNC_H__ +#ifndef STM32MP1_CLKFUNC_H +#define STM32MP1_CLKFUNC_H #include <stdbool.h> @@ -39,4 +39,4 @@ bool fdt_get_rcc_secure_status(void); uintptr_t fdt_get_stgen_base(void); int fdt_get_clock_id(int node); -#endif /* __STM32MP1_CLKFUNC_H__ */ +#endif /* STM32MP1_CLKFUNC_H */ diff --git a/include/drivers/st/stm32mp1_ddr.h b/include/drivers/st/stm32mp1_ddr.h index 076566484..363e3020c 100644 --- a/include/drivers/st/stm32mp1_ddr.h +++ b/include/drivers/st/stm32mp1_ddr.h @@ -4,10 +4,11 @@ * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ -#ifndef _STM32MP1_DDR_H -#define _STM32MP1_DDR_H +#ifndef STM32MP1_DDR_H +#define STM32MP1_DDR_H #include <stdbool.h> +#include <stdint.h> #define DT_DDR_COMPAT "st,stm32mp1-ddr" @@ -170,4 +171,4 @@ struct stm32mp1_ddr_config { int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint16_t mem_speed); void stm32mp1_ddr_init(struct ddr_info *priv, struct stm32mp1_ddr_config *config); -#endif /* _STM32MP1_DDR_H */ +#endif /* STM32MP1_DDR_H */ diff --git a/include/drivers/st/stm32mp1_ddr_helpers.h b/include/drivers/st/stm32mp1_ddr_helpers.h index 298a08044..38f24152a 100644 --- a/include/drivers/st/stm32mp1_ddr_helpers.h +++ b/include/drivers/st/stm32mp1_ddr_helpers.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_DDR_HELPERS_H__ -#define __STM32MP1_DDR_HELPERS_H__ +#ifndef STM32MP1_DDR_HELPERS_H +#define STM32MP1_DDR_HELPERS_H void ddr_enable_clock(void); -#endif /* __STM32MP1_DDR_HELPERS_H__ */ +#endif /* STM32MP1_DDR_HELPERS_H */ diff --git a/include/drivers/st/stm32mp1_ddr_regs.h b/include/drivers/st/stm32mp1_ddr_regs.h index 64ad96554..9598d9ba5 100644 --- a/include/drivers/st/stm32mp1_ddr_regs.h +++ b/include/drivers/st/stm32mp1_ddr_regs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ -#ifndef _RAM_STM32MP1_DDR_REGS_H -#define _RAM_STM32MP1_DDR_REGS_H +#ifndef STM32MP1_DDR_REGS_H +#define STM32MP1_DDR_REGS_H #include <utils_def.h> @@ -410,4 +410,4 @@ struct stm32mp1_ddrphy { void ddr_enable_clock(void); -#endif /* _RAM_STM32MP1_DDR_REGS_H */ +#endif /* STM32MP1_DDR_REGS_H */ diff --git a/include/drivers/st/stm32mp1_pmic.h b/include/drivers/st/stm32mp1_pmic.h index 5d94b404b..cc80b25ab 100644 --- a/include/drivers/st/stm32mp1_pmic.h +++ b/include/drivers/st/stm32mp1_pmic.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_PMIC_H__ -#define __STM32MP1_PMIC_H__ +#ifndef STM32MP1_PMIC_H +#define STM32MP1_PMIC_H #include <stdbool.h> @@ -15,4 +15,4 @@ void initialize_pmic_i2c(void); void initialize_pmic(void); int pmic_ddr_power_init(enum ddr_type ddr_type); -#endif /* __STM32MP1_PMIC_H__ */ +#endif /* STM32MP1_PMIC_H */ diff --git a/include/drivers/st/stm32mp1_pwr.h b/include/drivers/st/stm32mp1_pwr.h index e56704295..b34536eae 100644 --- a/include/drivers/st/stm32mp1_pwr.h +++ b/include/drivers/st/stm32mp1_pwr.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_PWR_H__ -#define __STM32MP1_PWR_H__ +#ifndef STM32MP1_PWR_H +#define STM32MP1_PWR_H #include <utils_def.h> @@ -29,4 +29,4 @@ #define PWR_MPUCR_CSTDBYDIS BIT(3) #define PWR_MPUCR_CSSF BIT(9) -#endif /* __STM32MP1_PWR_H__ */ +#endif /* STM32MP1_PWR_H */ diff --git a/include/drivers/st/stm32mp1_ram.h b/include/drivers/st/stm32mp1_ram.h index af9617779..38360e759 100644 --- a/include/drivers/st/stm32mp1_ram.h +++ b/include/drivers/st/stm32mp1_ram.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _STM32MP1_RAM_H -#define _STM32MP1_RAM_H +#ifndef STM32MP1_RAM_H +#define STM32MP1_RAM_H int stm32mp1_ddr_probe(void); -#endif /* _STM32MP1_RAM_H */ +#endif /* STM32MP1_RAM_H */ diff --git a/include/drivers/st/stm32mp1_rcc.h b/include/drivers/st/stm32mp1_rcc.h index e28ca979f..87f4d7f73 100644 --- a/include/drivers/st/stm32mp1_rcc.h +++ b/include/drivers/st/stm32mp1_rcc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_RCC_H__ -#define __STM32MP1_RCC_H__ +#ifndef STM32MP1_RCC_H +#define STM32MP1_RCC_H #include <utils_def.h> @@ -365,4 +365,4 @@ /* Values of RCC_MP_AHB4ENSETR register */ #define RCC_MP_AHB4ENSETR_GPIOGEN BIT(6) -#endif /* __STM32MP1_RCC_H__ */ +#endif /* STM32MP1_RCC_H */ diff --git a/include/drivers/st/stm32mp1_reset.h b/include/drivers/st/stm32mp1_reset.h index 76ee09d8d..cd488cc33 100644 --- a/include/drivers/st/stm32mp1_reset.h +++ b/include/drivers/st/stm32mp1_reset.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_RESET_H__ -#define __STM32MP1_RESET_H__ +#ifndef STM32MP1_RESET_H +#define STM32MP1_RESET_H #include <stdint.h> void stm32mp1_reset_assert(uint32_t reset_id); void stm32mp1_reset_deassert(uint32_t reset_id); -#endif /* __STM32MP1_RESET_H__ */ +#endif /* STM32MP1_RESET_H */ diff --git a/include/drivers/st/stpmu1.h b/include/drivers/st/stpmu1.h index 1b93ab2c7..4bbcebbec 100644 --- a/include/drivers/st/stpmu1.h +++ b/include/drivers/st/stpmu1.h @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ - -#ifndef __STPMU1_H__ -#define __STPMU1_H__ +#ifndef STPMU1_H +#define STPMU1_H #include <stm32_i2c.h> #include <utils_def.h> @@ -138,4 +137,4 @@ uint8_t stpmu1_is_regulator_enabled(const char *name); int stpmu1_regulator_voltage_set(const char *name, uint16_t millivolts); void stpmu1_bind_i2c(struct i2c_handle_s *i2c_handle, uint16_t i2c_addr); -#endif /* __STPMU1_H__ */ +#endif /* STPMU1_H */ diff --git a/include/drivers/synopsys/dw_mmc.h b/include/drivers/synopsys/dw_mmc.h index 1ec8d1da8..533a876fc 100644 --- a/include/drivers/synopsys/dw_mmc.h +++ b/include/drivers/synopsys/dw_mmc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DW_MMC_H__ -#define __DW_MMC_H__ +#ifndef DW_MMC_H +#define DW_MMC_H #include <mmc.h> @@ -20,4 +20,4 @@ typedef struct dw_mmc_params { void dw_mmc_init(dw_mmc_params_t *params, struct mmc_device_info *info); -#endif /* __DW_MMC_H__ */ +#endif /* DW_MMC_H */ diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h index 9ee2a336f..ad80c5772 100644 --- a/include/drivers/ti/uart/uart_16550.h +++ b/include/drivers/ti/uart/uart_16550.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __UART_16550_H__ -#define __UART_16550_H__ +#ifndef UART_16550_H +#define UART_16550_H #include <console.h> @@ -93,4 +93,4 @@ int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, #endif /*__ASSEMBLY__*/ -#endif /* __UART_16550_H__ */ +#endif /* UART_16550_H */ diff --git a/include/drivers/ufs.h b/include/drivers/ufs.h index 88dedc5ae..414649bd4 100644 --- a/include/drivers/ufs.h +++ b/include/drivers/ufs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __UFS_H__ -#define __UFS_H__ +#ifndef UFS_H +#define UFS_H #include <utils_def.h> @@ -545,4 +545,4 @@ size_t ufs_read_blocks(int lun, int lba, uintptr_t buf, size_t size); size_t ufs_write_blocks(int lun, int lba, const uintptr_t buf, size_t size); int ufs_init(const ufs_ops_t *ops, ufs_params_t *params); -#endif /* __UFS_H__ */ +#endif /* UFS_H */ diff --git a/include/lib/aarch32/arch.h b/include/lib/aarch32/arch.h index 3536d2032..38e01bd33 100644 --- a/include/lib/aarch32/arch.h +++ b/include/lib/aarch32/arch.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARCH_H__ -#define __ARCH_H__ +#ifndef ARCH_H +#define ARCH_H #include <utils_def.h> @@ -630,4 +630,4 @@ #define AMEVTYPER1E p15, 0, c13, c15, 6 #define AMEVTYPER1F p15, 0, c13, c15, 7 -#endif /* __ARCH_H__ */ +#endif /* ARCH_H */ diff --git a/include/lib/aarch32/smccc_helpers.h b/include/lib/aarch32/smccc_helpers.h index 5eeb204dd..67952ec50 100644 --- a/include/lib/aarch32/smccc_helpers.h +++ b/include/lib/aarch32/smccc_helpers.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMCCC_HELPERS_H__ -#define __SMCCC_HELPERS_H__ +#ifndef SMCCC_HELPERS_H +#define SMCCC_HELPERS_H #include <smccc.h> @@ -156,4 +156,4 @@ void *smc_get_next_ctx(void); #endif /*__ASSEMBLY__*/ -#endif /* __SMCCC_HELPERS_H__ */ +#endif /* SMCCC_HELPERS_H */ diff --git a/include/lib/aarch32/smccc_macros.S b/include/lib/aarch32/smccc_macros.S index fdb65e80a..1fe6c64dc 100644 --- a/include/lib/aarch32/smccc_macros.S +++ b/include/lib/aarch32/smccc_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMCCC_MACROS_S__ -#define __SMCCC_MACROS_S__ +#ifndef SMCCC_MACROS_S +#define SMCCC_MACROS_S #include <arch.h> @@ -196,4 +196,4 @@ eret .endm -#endif /* __SMCCC_MACROS_S__ */ +#endif /* SMCCC_MACROS_S */ diff --git a/include/lib/aarch64/setjmp.h b/include/lib/aarch64/setjmp.h index c65810d82..bbfe1df43 100644 --- a/include/lib/aarch64/setjmp.h +++ b/include/lib/aarch64/setjmp.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __JMP_H__ -#define __JMP_H__ +#ifndef SETJMP_H +#define SETJMP_H #define JMP_CTX_X19 0x0 #define JMP_CTX_X21 0x10 @@ -56,4 +56,4 @@ int setjmp(struct jmpbuf *buf); void longjmp(struct jmpbuf *buf); #endif /* __ASSEMBLY__ */ -#endif /* __JMP_H__ */ +#endif /* SETJMP_H */ diff --git a/include/lib/aarch64/smccc_helpers.h b/include/lib/aarch64/smccc_helpers.h index c76faf523..efab18b0c 100644 --- a/include/lib/aarch64/smccc_helpers.h +++ b/include/lib/aarch64/smccc_helpers.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMCCC_HELPERS_H__ -#define __SMCCC_HELPERS_H__ +#ifndef SMCCC_HELPERS_H +#define SMCCC_HELPERS_H #include <smccc.h> @@ -82,4 +82,4 @@ #endif /*__ASSEMBLY__*/ -#endif /* __SMCCC_HELPERS_H__ */ +#endif /* SMCCC_HELPERS_H */ diff --git a/include/lib/cassert.h b/include/lib/cassert.h index 3119e1f80..bbfdfdb2e 100644 --- a/include/lib/cassert.h +++ b/include/lib/cassert.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CASSERT_H__ -#define __CASSERT_H__ +#ifndef CASSERT_H +#define CASSERT_H #include <cdefs.h> @@ -20,4 +20,4 @@ #define CASSERT(cond, msg) \ typedef char msg[(cond) ? 1 : -1] __unused -#endif /* __CASSERT_H__ */ +#endif /* CASSERT_H */ diff --git a/include/lib/coreboot.h b/include/lib/coreboot.h index f8fbd93d5..88212c315 100644 --- a/include/lib/coreboot.h +++ b/include/lib/coreboot.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __COREBOOT_H__ -#define __COREBOOT_H__ +#ifndef COREBOOT_H +#define COREBOOT_H #include <stdint.h> @@ -21,4 +21,4 @@ extern coreboot_serial_t coreboot_serial; void coreboot_table_setup(void *base); -#endif /* __COREBOOT_H__ */ +#endif /* COREBOOT_H */ diff --git a/include/lib/cpus/aarch32/aem_generic.h b/include/lib/cpus/aarch32/aem_generic.h index f5476dfde..5fbdf5338 100644 --- a/include/lib/cpus/aarch32/aem_generic.h +++ b/include/lib/cpus/aarch32/aem_generic.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __AEM_GENERIC_H__ -#define __AEM_GENERIC_H__ +#ifndef AEM_GENERIC_H +#define AEM_GENERIC_H /* BASE AEM midr for revision 0 */ #define BASE_AEM_MIDR 0x410FD0F0 -#endif /* __AEM_GENERIC_H__ */ +#endif /* AEM_GENERIC_H */ diff --git a/include/lib/cpus/aarch32/cortex_a12.h b/include/lib/cpus/aarch32/cortex_a12.h index 3068a41fb..3aa7278a6 100644 --- a/include/lib/cpus/aarch32/cortex_a12.h +++ b/include/lib/cpus/aarch32/cortex_a12.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A12_H__ -#define __CORTEX_A12_H__ +#ifndef CORTEX_A12_H +#define CORTEX_A12_H /******************************************************************************* * Cortex-A12 midr with version/revision set to 0 @@ -17,4 +17,4 @@ ******************************************************************************/ #define CORTEX_A12_ACTLR_SMP_BIT (1 << 6) -#endif /* __CORTEX_A12_H__ */ +#endif /* CORTEX_A12_H */ diff --git a/include/lib/cpus/aarch32/cortex_a15.h b/include/lib/cpus/aarch32/cortex_a15.h index 0f01a4336..ca842f6f2 100644 --- a/include/lib/cpus/aarch32/cortex_a15.h +++ b/include/lib/cpus/aarch32/cortex_a15.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A15_H__ -#define __CORTEX_A15_H__ +#ifndef CORTEX_A15_H +#define CORTEX_A15_H /******************************************************************************* * Cortex-A15 midr with version/revision set to 0 @@ -18,4 +18,4 @@ #define CORTEX_A15_ACTLR_INV_BTB_BIT (1 << 0) #define CORTEX_A15_ACTLR_SMP_BIT (1 << 6) -#endif /* __CORTEX_A15_H__ */ +#endif /* CORTEX_A15_H */ diff --git a/include/lib/cpus/aarch32/cortex_a17.h b/include/lib/cpus/aarch32/cortex_a17.h index d2ca91c41..b5a4a90ab 100644 --- a/include/lib/cpus/aarch32/cortex_a17.h +++ b/include/lib/cpus/aarch32/cortex_a17.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A17_H__ -#define __CORTEX_A17_H__ +#ifndef CORTEX_A17_H +#define CORTEX_A17_H /******************************************************************************* * Cortex-A17 midr with version/revision set to 0 @@ -17,4 +17,4 @@ ******************************************************************************/ #define CORTEX_A17_ACTLR_SMP_BIT (1 << 6) -#endif /* __CORTEX_A17_H__ */ +#endif /* CORTEX_A17_H */ diff --git a/include/lib/cpus/aarch32/cortex_a32.h b/include/lib/cpus/aarch32/cortex_a32.h index 4d6826a5f..36322d2c0 100644 --- a/include/lib/cpus/aarch32/cortex_a32.h +++ b/include/lib/cpus/aarch32/cortex_a32.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A32_H__ -#define __CORTEX_A32_H__ +#ifndef CORTEX_A32_H +#define CORTEX_A32_H /* Cortex-A32 Main ID register for revision 0 */ #define CORTEX_A32_MIDR 0x410FD010 @@ -17,4 +17,4 @@ #define CORTEX_A32_CPUECTLR_EL1 p15, 1, c15 #define CORTEX_A32_CPUECTLR_SMPEN_BIT (1 << 6) -#endif /* __CORTEX_A32_H__ */ +#endif /* CORTEX_A32_H */ diff --git a/include/lib/cpus/aarch32/cortex_a5.h b/include/lib/cpus/aarch32/cortex_a5.h index 0a0b7ffa5..3e58f2500 100644 --- a/include/lib/cpus/aarch32/cortex_a5.h +++ b/include/lib/cpus/aarch32/cortex_a5.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A5_H__ -#define __CORTEX_A5_H__ +#ifndef CORTEX_A5_H +#define CORTEX_A5_H /******************************************************************************* * Cortex-A8 midr with version/revision set to 0 @@ -17,4 +17,4 @@ ******************************************************************************/ #define CORTEX_A5_ACTLR_SMP_BIT (1 << 6) -#endif /* __CORTEX_A5_H__ */ +#endif /* CORTEX_A5_H */ diff --git a/include/lib/cpus/aarch32/cortex_a53.h b/include/lib/cpus/aarch32/cortex_a53.h index a7a681f53..a2d7ec093 100644 --- a/include/lib/cpus/aarch32/cortex_a53.h +++ b/include/lib/cpus/aarch32/cortex_a53.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A53_H__ -#define __CORTEX_A53_H__ +#ifndef CORTEX_A53_H +#define CORTEX_A53_H /* Cortex-A53 midr for revision 0 */ #define CORTEX_A53_MIDR 0x410FD030 @@ -67,4 +67,4 @@ ******************************************************************************/ #define CORTEX_A53_L2MERRSR p15, 3, c15 -#endif /* __CORTEX_A53_H__ */ +#endif /* CORTEX_A53_H */ diff --git a/include/lib/cpus/aarch32/cortex_a57.h b/include/lib/cpus/aarch32/cortex_a57.h index 3f0fb04be..6f60c1146 100644 --- a/include/lib/cpus/aarch32/cortex_a57.h +++ b/include/lib/cpus/aarch32/cortex_a57.h @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A57_H__ -#define __CORTEX_A57_H__ +#ifndef CORTEX_A57_H +#define CORTEX_A57_H + #include <utils_def.h> /* Cortex-A57 midr for revision 0 */ @@ -79,4 +80,4 @@ ******************************************************************************/ #define CORTEX_A57_L2MERRSR p15, 3, c15 -#endif /* __CORTEX_A57_H__ */ +#endif /* CORTEX_A57_H */ diff --git a/include/lib/cpus/aarch32/cortex_a7.h b/include/lib/cpus/aarch32/cortex_a7.h index 61b0d0085..03fc11844 100644 --- a/include/lib/cpus/aarch32/cortex_a7.h +++ b/include/lib/cpus/aarch32/cortex_a7.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A7_H__ -#define __CORTEX_A7_H__ +#ifndef CORTEX_A7_H +#define CORTEX_A7_H /******************************************************************************* * Cortex-A7 midr with version/revision set to 0 @@ -17,4 +17,4 @@ ******************************************************************************/ #define CORTEX_A7_ACTLR_SMP_BIT (1 << 6) -#endif /* __CORTEX_A7_H__ */ +#endif /* CORTEX_A7_H */ diff --git a/include/lib/cpus/aarch32/cortex_a72.h b/include/lib/cpus/aarch32/cortex_a72.h index 1a3c014ea..f45865a39 100644 --- a/include/lib/cpus/aarch32/cortex_a72.h +++ b/include/lib/cpus/aarch32/cortex_a72.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A72_H__ -#define __CORTEX_A72_H__ +#ifndef CORTEX_A72_H +#define CORTEX_A72_H #include <utils_def.h> /* Cortex-A72 midr for revision 0 */ @@ -54,4 +54,4 @@ ******************************************************************************/ #define CORTEX_A72_L2MERRSR p15, 3, c15 -#endif /* __CORTEX_A72_H__ */ +#endif /* CORTEX_A72_H */ diff --git a/include/lib/cpus/aarch32/cortex_a9.h b/include/lib/cpus/aarch32/cortex_a9.h index be85f9bea..a9e86ef64 100644 --- a/include/lib/cpus/aarch32/cortex_a9.h +++ b/include/lib/cpus/aarch32/cortex_a9.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A9_H__ -#define __CORTEX_A9_H__ +#ifndef CORTEX_A9_H +#define CORTEX_A9_H /******************************************************************************* * Cortex-A9 midr with version/revision set to 0 @@ -28,4 +28,4 @@ DEFINE_COPROCR_RW_FUNCS(pcr, PCR) #endif -#endif /* __CORTEX_A9_H__ */ +#endif /* CORTEX_A9_H */ diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S index aa728b241..1c0da0f2b 100644 --- a/include/lib/cpus/aarch32/cpu_macros.S +++ b/include/lib/cpus/aarch32/cpu_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CPU_MACROS_S__ -#define __CPU_MACROS_S__ +#ifndef CPU_MACROS_S +#define CPU_MACROS_S #include <arch.h> #include <errata_report.h> @@ -227,4 +227,4 @@ beq \_label .endm -#endif /* __CPU_MACROS_S__ */ +#endif /* CPU_MACROS_S */ diff --git a/include/lib/cpus/aarch64/aem_generic.h b/include/lib/cpus/aarch64/aem_generic.h index ddb235fda..1edef84da 100644 --- a/include/lib/cpus/aarch64/aem_generic.h +++ b/include/lib/cpus/aarch64/aem_generic.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __AEM_GENERIC_H__ -#define __AEM_GENERIC_H__ +#ifndef AEM_GENERIC_H +#define AEM_GENERIC_H /* BASE AEM midr for revision 0 */ #define BASE_AEM_MIDR 0x410FD0F0 @@ -13,5 +13,4 @@ /* Foundation AEM midr for revision 0 */ #define FOUNDATION_AEM_MIDR 0x410FD000 - -#endif /* __AEM_GENERIC_H__ */ +#endif /* AEM_GENERIC_H */ diff --git a/include/lib/cpus/aarch64/cortex_a35.h b/include/lib/cpus/aarch64/cortex_a35.h index ad0fedc73..2363198f6 100644 --- a/include/lib/cpus/aarch64/cortex_a35.h +++ b/include/lib/cpus/aarch64/cortex_a35.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A35_H__ -#define __CORTEX_A35_H__ +#ifndef CORTEX_A35_H +#define CORTEX_A35_H /* Cortex-A35 Main ID register for revision 0 */ #define CORTEX_A35_MIDR 0x410FD040 @@ -17,4 +17,4 @@ #define CORTEX_A35_CPUECTLR_EL1 S3_1_C15_C2_1 #define CORTEX_A35_CPUECTLR_SMPEN_BIT (1 << 6) -#endif /* __CORTEX_A35_H__ */ +#endif /* CORTEX_A35_H */ diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h index 9aa118b55..4b7d238c9 100644 --- a/include/lib/cpus/aarch64/cortex_a53.h +++ b/include/lib/cpus/aarch64/cortex_a53.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A53_H__ -#define __CORTEX_A53_H__ +#ifndef CORTEX_A53_H +#define CORTEX_A53_H /* Cortex-A53 midr for revision 0 */ #define CORTEX_A53_MIDR U(0x410FD030) @@ -71,4 +71,4 @@ ******************************************************************************/ #define CORTEX_A53_L2MERRSR_EL1 S3_1_C15_C2_3 -#endif /* __CORTEX_A53_H__ */ +#endif /* CORTEX_A53_H */ diff --git a/include/lib/cpus/aarch64/cortex_a55.h b/include/lib/cpus/aarch64/cortex_a55.h index 293f2b240..763b7cbb0 100644 --- a/include/lib/cpus/aarch64/cortex_a55.h +++ b/include/lib/cpus/aarch64/cortex_a55.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A55_H__ -#define __CORTEX_A55_H__ +#ifndef CORTEX_A55_H +#define CORTEX_A55_H /* Cortex-A55 MIDR for revision 0 */ #define CORTEX_A55_MIDR 0x410fd050 @@ -19,4 +19,4 @@ /* Definitions of register field mask in CORTEX_A55_CPUPWRCTLR_EL1 */ #define CORTEX_A55_CORE_PWRDN_EN_MASK 0x1 -#endif /* __CORTEX_A55_H__ */ +#endif /* CORTEX_A55_H */ diff --git a/include/lib/cpus/aarch64/cortex_a57.h b/include/lib/cpus/aarch64/cortex_a57.h index 97d074e00..71d07db5f 100644 --- a/include/lib/cpus/aarch64/cortex_a57.h +++ b/include/lib/cpus/aarch64/cortex_a57.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A57_H__ -#define __CORTEX_A57_H__ +#ifndef CORTEX_A57_H +#define CORTEX_A57_H #include <utils_def.h> /* Cortex-A57 midr for revision 0 */ @@ -81,4 +81,4 @@ ******************************************************************************/ #define CORTEX_A57_L2MERRSR_EL1 S3_1_C15_C2_3 -#endif /* __CORTEX_A57_H__ */ +#endif /* CORTEX_A57_H */ diff --git a/include/lib/cpus/aarch64/cortex_a72.h b/include/lib/cpus/aarch64/cortex_a72.h index 5b9e06de2..4eafc11e1 100644 --- a/include/lib/cpus/aarch64/cortex_a72.h +++ b/include/lib/cpus/aarch64/cortex_a72.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A72_H__ -#define __CORTEX_A72_H__ +#ifndef CORTEX_A72_H +#define CORTEX_A72_H #include <utils_def.h> /* Cortex-A72 midr for revision 0 */ @@ -61,4 +61,4 @@ ******************************************************************************/ #define CORTEX_A72_L2MERRSR_EL1 S3_1_C15_C2_3 -#endif /* __CORTEX_A72_H__ */ +#endif /* CORTEX_A72_H */ diff --git a/include/lib/cpus/aarch64/cortex_a73.h b/include/lib/cpus/aarch64/cortex_a73.h index 4db0cae23..77ea205c2 100644 --- a/include/lib/cpus/aarch64/cortex_a73.h +++ b/include/lib/cpus/aarch64/cortex_a73.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A73_H__ -#define __CORTEX_A73_H__ +#ifndef CORTEX_A73_H +#define CORTEX_A73_H /* Cortex-A73 midr for revision 0 */ #define CORTEX_A73_MIDR 0x410FD090 @@ -29,4 +29,4 @@ #define CORTEX_A73_IMP_DEF_REG1_DISABLE_LOAD_PASS_STORE (1 << 3) -#endif /* __CORTEX_A73_H__ */ +#endif /* CORTEX_A73_H */ diff --git a/include/lib/cpus/aarch64/cortex_a76.h b/include/lib/cpus/aarch64/cortex_a76.h index 1cb774763..4dea64b7a 100644 --- a/include/lib/cpus/aarch64/cortex_a76.h +++ b/include/lib/cpus/aarch64/cortex_a76.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_A76_H__ -#define __CORTEX_A76_H__ +#ifndef CORTEX_A76_H +#define CORTEX_A76_H /* Cortex-A76 MIDR for revision 0 */ #define CORTEX_A76_MIDR 0x410fd0b0 @@ -26,4 +26,4 @@ /* Definitions of register field mask in CORTEX_A76_CPUPWRCTLR_EL1 */ #define CORTEX_A76_CORE_PWRDN_EN_MASK 0x1 -#endif /* __CORTEX_A76_H__ */ +#endif /* CORTEX_A76_H */ diff --git a/include/lib/cpus/aarch64/cortex_deimos.h b/include/lib/cpus/aarch64/cortex_deimos.h index 3c3656740..694fb1527 100644 --- a/include/lib/cpus/aarch64/cortex_deimos.h +++ b/include/lib/cpus/aarch64/cortex_deimos.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_DEIMOS_H__ -#define __CORTEX_DEIMOS_H__ +#ifndef CORTEX_DEIMOS_H +#define CORTEX_DEIMOS_H #define CORTEX_DEIMOS_MIDR U(0x410FD0D0) @@ -20,4 +20,4 @@ #define CORTEX_DEIMOS_CPUPWRCTLR_EL1 S3_0_C15_C2_7 #define CORTEX_DEIMOS_CPUPWRCTLR_EL1_CORE_PWRDN_BIT (U(1) << 0) -#endif /* __CORTEX_DEIMOS_H__ */ +#endif /* CORTEX_DEIMOS_H */ diff --git a/include/lib/cpus/aarch64/cortex_helios.h b/include/lib/cpus/aarch64/cortex_helios.h index 1098a124e..571ea9df5 100644 --- a/include/lib/cpus/aarch64/cortex_helios.h +++ b/include/lib/cpus/aarch64/cortex_helios.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CORTEX_HELIOS_H__ -#define __CORTEX_HELIOS_H__ +#ifndef CORTEX_HELIOS_H +#define CORTEX_HELIOS_H #define CORTEX_HELIOS_MIDR U(0x410FD060) @@ -26,4 +26,4 @@ #define CORTEX_HELIOS_CPUPWRCTLR_EL1 S3_0_C15_C2_7 #define CORTEX_HELIOS_CPUPWRCTLR_EL1_CORE_PWRDN_BIT (U(1) << 0) -#endif /* __CORTEX_HELIOS_H__ */ +#endif /* CORTEX_HELIOS_H */ diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S index 14616ace4..287570054 100644 --- a/include/lib/cpus/aarch64/cpu_macros.S +++ b/include/lib/cpus/aarch64/cpu_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CPU_MACROS_S__ -#define __CPU_MACROS_S__ +#ifndef CPU_MACROS_S +#define CPU_MACROS_S #include <arch.h> #include <errata_report.h> @@ -255,8 +255,6 @@ .endm #endif -#endif /* __CPU_MACROS_S__ */ - /* * This macro is used on some CPUs to detect if they are vulnerable * to CVE-2017-5715. @@ -285,3 +283,5 @@ cmp w0, #((\_cpu_midr >> MIDR_PN_SHIFT) & MIDR_PN_MASK) b.eq \_label .endm + +#endif /* CPU_MACROS_S */ diff --git a/include/lib/cpus/aarch64/denver.h b/include/lib/cpus/aarch64/denver.h index 712a4a437..81c076a1a 100644 --- a/include/lib/cpus/aarch64/denver.h +++ b/include/lib/cpus/aarch64/denver.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DENVER_H__ -#define __DENVER_H__ +#ifndef DENVER_H +#define DENVER_H /* MIDR values for Denver */ #define DENVER_MIDR_PN0 U(0x4E0F0000) @@ -39,6 +39,6 @@ /* Disable Dynamic Code Optimisation */ void denver_disable_dco(void); -#endif +#endif /* __ASSEMBLY__ */ -#endif /* __DENVER_H__ */ +#endif /* DENVER_H */ diff --git a/include/lib/el3_runtime/pubsub.h b/include/lib/el3_runtime/pubsub.h index 2c8a1967e..930952ff8 100644 --- a/include/lib/el3_runtime/pubsub.h +++ b/include/lib/el3_runtime/pubsub.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PUBSUB_H__ -#define __PUBSUB_H__ +#ifndef PUBSUB_H +#define PUBSUB_H #define __pubsub_start_sym(event) __pubsub_##event##_start #define __pubsub_end_sym(event) __pubsub_##event##_end @@ -84,4 +84,4 @@ typedef void* (*pubsub_cb_t)(const void *arg); #endif /* __LINKER__ */ -#endif /* __PUBSUB_H__ */ +#endif /* PUBSUB_H */ diff --git a/include/lib/extensions/ras.h b/include/lib/extensions/ras.h index 400de5925..62fd63f93 100644 --- a/include/lib/extensions/ras.h +++ b/include/lib/extensions/ras.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef RAS_COMMON -#define RAS_COMMON +#ifndef RAS_H +#define RAS_H #define ERR_HANDLER_VERSION 1U @@ -196,4 +196,5 @@ int ras_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie, void ras_init(void); #endif /* __ASSEMBLY__ */ -#endif /* RAS_COMMON */ + +#endif /* RAS_H */ diff --git a/include/lib/libc/aarch32/endian_.h b/include/lib/libc/aarch32/endian_.h index 83a26b723..0cf2c755f 100644 --- a/include/lib/libc/aarch32/endian_.h +++ b/include/lib/libc/aarch32/endian_.h @@ -36,8 +36,8 @@ * All rights reserved. */ -#ifndef AARCH32_ENDIAN_H -#define AARCH32_ENDIAN_H +#ifndef ENDIAN__H +#define ENDIAN__H #include <stdint.h> @@ -143,4 +143,4 @@ __bswap16_var(uint16_t v) #define __bswap32(x) __bswap32_var(x) #endif /* __OPTIMIZE__ */ -#endif /* AARCH32_ENDIAN_H */ +#endif /* ENDIAN__H */ diff --git a/include/lib/libc/aarch32/stddef_.h b/include/lib/libc/aarch32/stddef_.h index 928481ce9..1babfade3 100644 --- a/include/lib/libc/aarch32/stddef_.h +++ b/include/lib/libc/aarch32/stddef_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDDEF__H +#define STDDEF__H + #ifndef SIZET_ typedef unsigned int size_t; #define SIZET_ @@ -13,3 +16,5 @@ typedef unsigned int size_t; typedef long ptrdiff_t; #define _PTRDIFF_T #endif + +#endif /* STDDEF__H */ diff --git a/include/lib/libc/aarch32/stdio_.h b/include/lib/libc/aarch32/stdio_.h index 98304bc3c..50d3cc2ed 100644 --- a/include/lib/libc/aarch32/stdio_.h +++ b/include/lib/libc/aarch32/stdio_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDIO__H +#define STDIO__H + #ifndef SIZET_ typedef unsigned int size_t; #define SIZET_ @@ -13,3 +16,5 @@ typedef unsigned int size_t; typedef int ssize_t; #define SSIZET_ #endif + +#endif /* STDIO__H */ diff --git a/include/lib/libc/aarch32/stdlib_.h b/include/lib/libc/aarch32/stdlib_.h index af96d0162..9c07857a5 100644 --- a/include/lib/libc/aarch32/stdlib_.h +++ b/include/lib/libc/aarch32/stdlib_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDLIB__H +#define STDLIB__H + #ifndef SIZET_ typedef unsigned int size_t; #define SIZET_ @@ -11,3 +14,5 @@ typedef unsigned int size_t; #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 + +#endif /* STDLIB__H */ diff --git a/include/lib/libc/aarch32/string_.h b/include/lib/libc/aarch32/string_.h index b3ad602ff..4e139b0db 100644 --- a/include/lib/libc/aarch32/string_.h +++ b/include/lib/libc/aarch32/string_.h @@ -4,7 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STRING__H +#define STRING__H + #ifndef SIZET_ typedef unsigned int size_t; #define SIZET_ #endif + +#endif /* STRING__H */ diff --git a/include/lib/libc/aarch32/time_.h b/include/lib/libc/aarch32/time_.h index 4fc629d6d..a9169c293 100644 --- a/include/lib/libc/aarch32/time_.h +++ b/include/lib/libc/aarch32/time_.h @@ -4,9 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef TIME__H +#define TIME__H + #ifndef SIZET_ typedef unsigned int size_t; #define SIZET_ #endif typedef long int time_t; + +#endif /* TIME__H */ diff --git a/include/lib/libc/aarch64/endian_.h b/include/lib/libc/aarch64/endian_.h index c60b4752b..7c79fd43b 100644 --- a/include/lib/libc/aarch64/endian_.h +++ b/include/lib/libc/aarch64/endian_.h @@ -36,8 +36,8 @@ * All rights reserved. */ -#ifndef AARCH64_ENDIAN_H -#define AARCH64_ENDIAN_H +#ifndef ENDIAN__H +#define ENDIAN__H #include <stdint.h> @@ -125,4 +125,4 @@ __bswap16_var(uint16_t v) #define __bswap32(x) __bswap32_var(x) #endif /* __OPTIMIZE__ */ -#endif /* AARCH64_ENDIAN_H */ +#endif /* ENDIAN__H */ diff --git a/include/lib/libc/aarch64/stddef_.h b/include/lib/libc/aarch64/stddef_.h index 3e5883ece..b7d8209af 100644 --- a/include/lib/libc/aarch64/stddef_.h +++ b/include/lib/libc/aarch64/stddef_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDDEF__H +#define STDDEF__H + #ifndef SIZET_ typedef unsigned long size_t; #define SIZET_ @@ -13,3 +16,5 @@ typedef unsigned long size_t; typedef long ptrdiff_t; #define _PTRDIFF_T #endif + +#endif /* STDDEF__H */ diff --git a/include/lib/libc/aarch64/stdio_.h b/include/lib/libc/aarch64/stdio_.h index ad0b20063..09b0172dd 100644 --- a/include/lib/libc/aarch64/stdio_.h +++ b/include/lib/libc/aarch64/stdio_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDIO__H +#define STDIO__H + #ifndef SIZET_ typedef unsigned long size_t; #define SIZET_ @@ -13,3 +16,5 @@ typedef unsigned long size_t; typedef long ssize_t; #define SSIZET_ #endif + +#endif /* STDIO__H */ diff --git a/include/lib/libc/aarch64/stdlib_.h b/include/lib/libc/aarch64/stdlib_.h index 3612c9902..81a39d14a 100644 --- a/include/lib/libc/aarch64/stdlib_.h +++ b/include/lib/libc/aarch64/stdlib_.h @@ -4,6 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STDLIB__H +#define STDLIB__H + #ifndef SIZET_ typedef unsigned long size_t; #define SIZET_ @@ -11,3 +14,5 @@ typedef unsigned long size_t; #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 + +#endif /* STDLIB__H */ diff --git a/include/lib/libc/aarch64/string_.h b/include/lib/libc/aarch64/string_.h index a88a751a4..71c51a6cd 100644 --- a/include/lib/libc/aarch64/string_.h +++ b/include/lib/libc/aarch64/string_.h @@ -4,7 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef STRING__H +#define STRING__H + #ifndef SIZET_ typedef unsigned long size_t; #define SIZET_ #endif + +#endif /* STRING__H */ diff --git a/include/lib/libc/aarch64/time_.h b/include/lib/libc/aarch64/time_.h index cbc34e76a..68ab1b8dd 100644 --- a/include/lib/libc/aarch64/time_.h +++ b/include/lib/libc/aarch64/time_.h @@ -4,9 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#ifndef TIME__H +#define TIME__H + #ifndef SIZET_ typedef unsigned long size_t; #define SIZET_ #endif typedef long int time_t; + +#endif /* TIME__H */ diff --git a/include/lib/libc/endian.h b/include/lib/libc/endian.h index 2cc4c5fc0..4100f5737 100644 --- a/include/lib/libc/endian.h +++ b/include/lib/libc/endian.h @@ -188,4 +188,4 @@ le64enc(void *pp, uint64_t u) le32enc(p + 4, (uint32_t)(u >> 32)); } -#endif /* SYS_ENDIAN_H */ +#endif /* ENDIAN_H */ diff --git a/include/lib/mmio.h b/include/lib/mmio.h index 38fdf0f23..3242a7cc5 100644 --- a/include/lib/mmio.h +++ b/include/lib/mmio.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MMIO_H__ -#define __MMIO_H__ +#ifndef MMIO_H +#define MMIO_H #include <stdint.h> @@ -73,4 +73,4 @@ static inline void mmio_clrsetbits_32(uintptr_t addr, mmio_write_32(addr, (mmio_read_32(addr) & ~clear) | set); } -#endif /* __MMIO_H__ */ +#endif /* MMIO_H */ diff --git a/include/lib/optee_utils.h b/include/lib/optee_utils.h index 3d35b190d..b13c4504f 100644 --- a/include/lib/optee_utils.h +++ b/include/lib/optee_utils.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __OPTEE_UTILS_H__ -#define __OPTEE_UTILS_H__ +#ifndef OPTEE_UTILS_H +#define OPTEE_UTILS_H #include <bl_common.h> @@ -12,4 +12,4 @@ int parse_optee_header(entry_point_info_t *header_ep, image_info_t *pager_image_info, image_info_t *paged_image_info); -#endif /* __OPTEE_UTILS_H__ */ +#endif /* OPTEE_UTILS_H */ diff --git a/include/lib/pmf/pmf_asm_macros.S b/include/lib/pmf/pmf_asm_macros.S index 5e19e62f7..5f3e6b7ec 100644 --- a/include/lib/pmf/pmf_asm_macros.S +++ b/include/lib/pmf/pmf_asm_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMF_ASM_MACROS_S__ -#define __PMF_ASM_MACROS_S__ +#ifndef PMF_ASM_MACROS_S +#define PMF_ASM_MACROS_S #define PMF_TS_SIZE 8 @@ -27,4 +27,4 @@ add x0, x0, x1 .endm -#endif /* __PMF_ASM_MACROS_S__ */ +#endif /* PMF_ASM_MACROS_S */ diff --git a/include/lib/runtime_instr.h b/include/lib/runtime_instr.h index ed564e232..cb648391e 100644 --- a/include/lib/runtime_instr.h +++ b/include/lib/runtime_instr.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __RUNTIME_INSTR_H__ -#define __RUNTIME_INSTR_H__ +#ifndef RUNTIME_INSTR_H +#define RUNTIME_INSTR_H #include <utils_def.h> @@ -22,4 +22,4 @@ PMF_DECLARE_CAPTURE_TIMESTAMP(rt_instr_svc) PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc) #endif /* __ASSEMBLY__ */ -#endif /* __RUNTIME_INSTR_H__ */ +#endif /* RUNTIME_INSTR_H */ diff --git a/include/lib/semihosting.h b/include/lib/semihosting.h index eb7c4c3b3..006c7b750 100644 --- a/include/lib/semihosting.h +++ b/include/lib/semihosting.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SEMIHOSTING_H__ -#define __SEMIHOSTING_H__ +#ifndef SEMIHOSTING_H +#define SEMIHOSTING_H #include <stdint.h> #include <stdio.h> /* For ssize_t */ @@ -55,4 +55,4 @@ void semihosting_write_char(char character); void semihosting_write_string(char *string); char semihosting_read_char(void); -#endif /* __SEMIHOSTING_H__ */ +#endif /* SEMIHOSTING_H */ diff --git a/include/lib/smccc.h b/include/lib/smccc.h index b3dad1027..6ee8aa07d 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMCCC_H__ -#define __SMCCC_H__ +#ifndef SMCCC_H +#define SMCCC_H #include <utils_def.h> @@ -101,4 +101,4 @@ static inline uint32_t smc_uuid_word(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t (_uuid).node[4], (_uuid).node[5])) #endif /*__ASSEMBLY__*/ -#endif /* __SMCCC_H__ */ +#endif /* SMCCC_H */ diff --git a/include/lib/smccc_v1.h b/include/lib/smccc_v1.h index 98ef0211a..2b8bd8b3d 100644 --- a/include/lib/smccc_v1.h +++ b/include/lib/smccc_v1.h @@ -7,7 +7,7 @@ #ifndef SMCCC_V1_H #define SMCCC_V1_H -#ifndef __SMCCC_H__ +#ifndef SMCCC_H #error "This file must only be included from smccc.h" #endif diff --git a/include/lib/smccc_v2.h b/include/lib/smccc_v2.h index 628c160fd..22bf458dc 100644 --- a/include/lib/smccc_v2.h +++ b/include/lib/smccc_v2.h @@ -7,7 +7,7 @@ #ifndef SMCCC_V2_H #define SMCCC_V2_H -#ifndef __SMCCC_H__ +#ifndef SMCCC_H #error "This file must only be included from smccc.h" #endif diff --git a/include/lib/utils.h b/include/lib/utils.h index f324a9909..b6ab26ec7 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __UTILS_H__ -#define __UTILS_H__ +#ifndef UTILS_H +#define UTILS_H /* * C code should be put in this part of the header to avoid breaking ASM files @@ -92,4 +92,4 @@ static inline u_register_t load_addr_## _name(void) \ #endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */ -#endif /* __UTILS_H__ */ +#endif /* UTILS_H */ diff --git a/include/lib/xlat_tables/xlat_tables_defs.h b/include/lib/xlat_tables/xlat_tables_defs.h index d260c3ef0..09baae9bf 100644 --- a/include/lib/xlat_tables/xlat_tables_defs.h +++ b/include/lib/xlat_tables/xlat_tables_defs.h @@ -170,4 +170,4 @@ #define XN_SHIFT 54 #define UXN_SHIFT XN_SHIFT -#endif /* __XLAT_TABLES_DEFS_H__ */ +#endif /* XLAT_TABLES_DEFS_H */ diff --git a/include/lib/zlib/tf_gunzip.h b/include/lib/zlib/tf_gunzip.h index 46d20eb8a..741ba5014 100644 --- a/include/lib/zlib/tf_gunzip.h +++ b/include/lib/zlib/tf_gunzip.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TF_GUNZIP_H__ -#define __TF_GUNZIP_H__ +#ifndef TF_GUNZIP_H +#define TF_GUNZIP_H #include <stddef.h> #include <stdint.h> @@ -13,4 +13,4 @@ int gunzip(uintptr_t *in_buf, size_t in_len, uintptr_t *out_buf, size_t out_len, uintptr_t work_buf, size_t work_len); -#endif /* __TF_GUNZIP_H___ */ +#endif /* TF_GUNZIP_H */ diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index 1a80e165b..29211be2a 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __BOARD_CSS_DEF_H__ -#define __BOARD_CSS_DEF_H__ +#ifndef BOARD_CSS_DEF_H +#define BOARD_CSS_DEF_H #include <common_def.h> #include <soc_css_def.h> @@ -73,5 +73,4 @@ #define PLAT_ARM_TSP_UART_BASE V2M_IOFPGA_UART0_BASE #define PLAT_ARM_TSP_UART_CLK_IN_HZ V2M_IOFPGA_UART0_CLK_IN_HZ -#endif /* __BOARD_CSS_DEF_H__ */ - +#endif /* BOARD_CSS_DEF_H */ diff --git a/include/plat/arm/common/aarch64/arm_macros.S b/include/plat/arm/common/aarch64/arm_macros.S index 7953d7e24..c2ba7db9f 100644 --- a/include/plat/arm/common/aarch64/arm_macros.S +++ b/include/plat/arm/common/aarch64/arm_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARM_MACROS_S__ -#define __ARM_MACROS_S__ +#ifndef ARM_MACROS_S +#define ARM_MACROS_S #include <gic_common.h> #include <gicv2.h> @@ -91,4 +91,4 @@ gicd_ispendr_loop: exit_print_gic_regs: .endm -#endif /* __ARM_MACROS_S__ */ +#endif /* ARM_MACROS_S */ diff --git a/include/plat/arm/common/aarch64/cci_macros.S b/include/plat/arm/common/aarch64/cci_macros.S index 52e060d7b..069dc854f 100644 --- a/include/plat/arm/common/aarch64/cci_macros.S +++ b/include/plat/arm/common/aarch64/cci_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CCI_MACROS_S__ -#define __CCI_MACROS_S__ +#ifndef CCI_MACROS_S +#define CCI_MACROS_S #include <cci.h> #include <platform_def.h> @@ -34,4 +34,4 @@ cci_iface_regs: bl str_in_crash_buf_print .endm -#endif /* __CCI_MACROS_S__ */ +#endif /* CCI_MACROS_S */ diff --git a/include/plat/arm/common/arm_config.h b/include/plat/arm/common/arm_config.h index 44610bd97..4dda35060 100644 --- a/include/plat/arm/common/arm_config.h +++ b/include/plat/arm/common/arm_config.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARM_CONFIG_H__ -#define __ARM_CONFIG_H__ +#ifndef ARM_CONFIG_H +#define ARM_CONFIG_H #include <stdint.h> #include <utils_def.h> @@ -39,4 +39,4 @@ static inline const arm_config_t *get_arm_config(void) } -#endif /* __ARM_CONFIG_H__ */ +#endif /* ARM_CONFIG_H */ diff --git a/include/plat/arm/common/arm_spm_def.h b/include/plat/arm/common/arm_spm_def.h index 6aa8ce8ec..69aae4aa9 100644 --- a/include/plat/arm/common/arm_spm_def.h +++ b/include/plat/arm/common/arm_spm_def.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARM_SPM_DEF_H__ -#define __ARM_SPM_DEF_H__ +#ifndef ARM_SPM_DEF_H +#define ARM_SPM_DEF_H #include <arm_def.h> #include <utils_def.h> @@ -100,4 +100,4 @@ #define PLAT_SPM_COOKIE_0 ULL(0) #define PLAT_SPM_COOKIE_1 ULL(0) -#endif /* __ARM_SPM_DEF_H__ */ +#endif /* ARM_SPM_DEF_H */ diff --git a/include/plat/arm/css/common/aarch64/css_macros.S b/include/plat/arm/css/common/aarch64/css_macros.S index b669ef6b3..85a7044d7 100644 --- a/include/plat/arm/css/common/aarch64/css_macros.S +++ b/include/plat/arm/css/common/aarch64/css_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_MACROS_S__ -#define __CSS_MACROS_S__ +#ifndef CSS_MACROS_S +#define CSS_MACROS_S #include <arm_macros.S> #include <platform_def.h> @@ -22,5 +22,4 @@ arm_print_gic_regs .endm - -#endif /* __CSS_MACROS_S__ */ +#endif /* CSS_MACROS_S */ diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 385331977..4a7d314c9 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_DEF_H__ -#define __CSS_DEF_H__ +#ifndef CSS_DEF_H +#define CSS_DEF_H #include <arm_def.h> #include <gic_common.h> @@ -200,4 +200,4 @@ #define CSS_CPU_PWR_STATE_OFF 0 #define CSS_CPU_PWR_STATE(state, n) (((state) >> (n)) & 1) -#endif /* __CSS_DEF_H__ */ +#endif /* CSS_DEF_H */ diff --git a/include/plat/arm/css/common/css_pm.h b/include/plat/arm/css/common/css_pm.h index a24367134..eeb72de51 100644 --- a/include/plat/arm/css/common/css_pm.h +++ b/include/plat/arm/css/common/css_pm.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_PM_H__ -#define __CSS_PM_H__ +#ifndef CSS_PM_H +#define CSS_PM_H #include <cdefs.h> #include <psci.h> @@ -45,4 +45,4 @@ int css_node_hw_state(u_register_t mpidr, unsigned int power_level); */ extern const uint32_t plat_css_core_pos_to_scmi_dmn_id_map[]; -#endif /* __CSS_PM_H__ */ +#endif /* CSS_PM_H */ diff --git a/include/plat/arm/soc/common/soc_css.h b/include/plat/arm/soc/common/soc_css.h index 897bf2e01..469928d8d 100644 --- a/include/plat/arm/soc/common/soc_css.h +++ b/include/plat/arm/soc/common/soc_css.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_CSS_H__ -#define __SOC_CSS_H__ +#ifndef SOC_CSS_H +#define SOC_CSS_H /* * Utility functions for ARM CSS SoCs @@ -19,5 +19,4 @@ static inline void soc_css_security_setup(void) soc_css_init_pcie(); } - -#endif /* __SOC_CSS_H__ */ +#endif /* SOC_CSS_H */ diff --git a/include/plat/arm/soc/common/soc_css_def.h b/include/plat/arm/soc/common/soc_css_def.h index 3206f4e2e..263313a9a 100644 --- a/include/plat/arm/soc/common/soc_css_def.h +++ b/include/plat/arm/soc/common/soc_css_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_CSS_DEF_H__ -#define __SOC_CSS_DEF_H__ +#ifndef SOC_CSS_DEF_H +#define SOC_CSS_DEF_H #include <common_def.h> #include <utils_def.h> @@ -84,4 +84,4 @@ #define PLAT_ARM_SCP_TZC_DRAM1_SIZE ULL(0x00200000) #endif -#endif /* __SOC_CSS_DEF_H__ */ +#endif /* SOC_CSS_DEF_H */ diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 5d76d6e28..66074ac17 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __COMMON_DEF_H__ -#define __COMMON_DEF_H__ +#ifndef COMMON_DEF_H +#define COMMON_DEF_H #include <bl_common.h> #include <platform_def.h> @@ -83,4 +83,5 @@ #define BL2_CODE_END round_up(BL2_ROM_END, PAGE_SIZE) #endif /* BL2_IN_XIP_MEM */ #endif /* SEPARATE_CODE_AND_RODATA */ -#endif /* __COMMON_DEF_H__ */ + +#endif /* COMMON_DEF_H */ diff --git a/include/plat/marvell/a3700/common/armada_common.h b/include/plat/marvell/a3700/common/armada_common.h index 9fc463484..fdcc02a66 100644 --- a/include/plat/marvell/a3700/common/armada_common.h +++ b/include/plat/marvell/a3700/common/armada_common.h @@ -5,12 +5,12 @@ * https://spdx.org/licenses */ -#ifndef __ARMADA_COMMON_H__ -#define __ARMADA_COMMON_H__ +#ifndef ARMADA_COMMON_H +#define ARMADA_COMMON_H #include <io_addr_dec.h> #include <stdint.h> int marvell_get_io_dec_win_conf(struct dec_win_config **win, uint32_t *size); -#endif /* __ARMADA_COMMON_H__ */ +#endif /* ARMADA_COMMON_H */ diff --git a/include/plat/marvell/a3700/common/board_marvell_def.h b/include/plat/marvell/a3700/common/board_marvell_def.h index 49a1a5c3e..178259662 100644 --- a/include/plat/marvell/a3700/common/board_marvell_def.h +++ b/include/plat/marvell/a3700/common/board_marvell_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __BOARD_MARVELL_DEF_H__ -#define __BOARD_MARVELL_DEF_H__ +#ifndef BOARD_MARVELL_DEF_H +#define BOARD_MARVELL_DEF_H /* * Required platform porting definitions common to all ARM @@ -73,5 +73,4 @@ #define PLAT_MARVELL_TRUSTED_SRAM_SIZE 0x80000 /* 512 KB */ - -#endif /* __BOARD_MARVELL_DEF_H__ */ +#endif /* BOARD_MARVELL_DEF_H */ diff --git a/include/plat/marvell/a3700/common/marvell_def.h b/include/plat/marvell/a3700/common/marvell_def.h index 6c3a52487..3c105fca7 100644 --- a/include/plat/marvell/a3700/common/marvell_def.h +++ b/include/plat/marvell/a3700/common/marvell_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MARVELL_DEF_H__ -#define __MARVELL_DEF_H__ +#ifndef MARVELL_DEF_H +#define MARVELL_DEF_H #include <arch.h> #include <common_def.h> @@ -174,4 +174,4 @@ MARVELL_BL_RAM_SIZE) -#endif /* __MARVELL_DEF_H__ */ +#endif /* MARVELL_DEF_H */ diff --git a/include/plat/marvell/a3700/common/plat_marvell.h b/include/plat/marvell/a3700/common/plat_marvell.h index f733d0473..8c289e987 100644 --- a/include/plat/marvell/a3700/common/plat_marvell.h +++ b/include/plat/marvell/a3700/common/plat_marvell.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLAT_MARVELL_H__ -#define __PLAT_MARVELL_H__ +#ifndef PLAT_MARVELL_H +#define PLAT_MARVELL_H #include <bl_common.h> #include <cassert.h> @@ -93,4 +93,4 @@ void plat_marvell_interconnect_enter_coherency(void); const mmap_region_t *plat_marvell_get_mmap(void); -#endif /* __PLAT_MARVELL_H__ */ +#endif /* PLAT_MARVELL_H */ diff --git a/include/plat/marvell/a8k/common/armada_common.h b/include/plat/marvell/a8k/common/armada_common.h index c1e37f58a..64d9adf96 100644 --- a/include/plat/marvell/a8k/common/armada_common.h +++ b/include/plat/marvell/a8k/common/armada_common.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __ARMADA_COMMON_H__ -#define __ARMADA_COMMON_H__ +#ifndef ARMADA_COMMON_H +#define ARMADA_COMMON_H #include <amb_adec.h> #include <io_win.h> @@ -125,4 +125,4 @@ int marvell_get_iob_memory_map(struct addr_map_win **win, int marvell_get_ccu_memory_map(int ap_idx, struct addr_map_win **win, uint32_t *size); -#endif /* __A8K_COMMON_H__ */ +#endif /* ARMADA_COMMON_H */ diff --git a/include/plat/marvell/a8k/common/board_marvell_def.h b/include/plat/marvell/a8k/common/board_marvell_def.h index e67543ed5..0da56e7af 100644 --- a/include/plat/marvell/a8k/common/board_marvell_def.h +++ b/include/plat/marvell/a8k/common/board_marvell_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __BOARD_MARVELL_DEF_H__ -#define __BOARD_MARVELL_DEF_H__ +#ifndef BOARD_MARVELL_DEF_H +#define BOARD_MARVELL_DEF_H /* * Required platform porting definitions common to all ARM @@ -74,4 +74,4 @@ #define PLAT_MARVELL_TRUSTED_SRAM_SIZE 0x80000 /* 512 KB */ -#endif /* __BOARD_MARVELL_DEF_H__ */ +#endif /* BOARD_MARVELL_DEF_H */ diff --git a/include/plat/marvell/a8k/common/marvell_def.h b/include/plat/marvell/a8k/common/marvell_def.h index 9429753ce..c67b3cd87 100644 --- a/include/plat/marvell/a8k/common/marvell_def.h +++ b/include/plat/marvell/a8k/common/marvell_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MARVELL_DEF_H__ -#define __MARVELL_DEF_H__ +#ifndef MARVELL_DEF_H +#define MARVELL_DEF_H #include <arch.h> #include <common_def.h> @@ -178,4 +178,4 @@ MARVELL_BL_RAM_SIZE) -#endif /* __MARVELL_DEF_H__ */ +#endif /* MARVELL_DEF_H */ diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h index 2aecd3f50..f062491f9 100644 --- a/include/plat/marvell/a8k/common/plat_marvell.h +++ b/include/plat/marvell/a8k/common/plat_marvell.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLAT_MARVELL_H__ -#define __PLAT_MARVELL_H__ +#ifndef PLAT_MARVELL_H +#define PLAT_MARVELL_H #include <cassert.h> #include <cpu_data.h> @@ -127,4 +127,4 @@ void marvell_exit_bootrom(uintptr_t base); int plat_marvell_early_cpu_powerdown(void); int bl2_plat_handle_scp_bl2(image_info_t *scp_bl2_image_info); -#endif /* __PLAT_MARVELL_H__ */ +#endif /* PLAT_MARVELL_H */ diff --git a/include/plat/marvell/a8k/common/plat_pm_trace.h b/include/plat/marvell/a8k/common/plat_pm_trace.h index 0878959c4..a9549147d 100644 --- a/include/plat/marvell/a8k/common/plat_pm_trace.h +++ b/include/plat/marvell/a8k/common/plat_pm_trace.h @@ -5,9 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLAT_PM_TRACE_H -#define __PLAT_PM_TRACE_H - +#ifndef PLAT_PM_TRACE_H +#define PLAT_PM_TRACE_H /* * PM Trace is for Debug purpose only!!! @@ -97,4 +96,4 @@ extern core_trace_func funcTbl[PLATFORM_CORE_COUNT]; */ void pm_trace_add(unsigned int trace, unsigned int core); -#endif /* __PLAT_PM_TRACE_H */ +#endif /* PLAT_PM_TRACE_H */ diff --git a/include/plat/marvell/common/aarch64/cci_macros.S b/include/plat/marvell/common/aarch64/cci_macros.S index d6080cfdd..96b364eeb 100644 --- a/include/plat/marvell/common/aarch64/cci_macros.S +++ b/include/plat/marvell/common/aarch64/cci_macros.S @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __CCI_MACROS_S__ -#define __CCI_MACROS_S__ +#ifndef CCI_MACROS_S +#define CCI_MACROS_S #include <cci.h> #include <platform_def.h> @@ -36,4 +36,4 @@ cci_iface_regs: bl str_in_crash_buf_print .endm -#endif /* __CCI_MACROS_S__ */ +#endif /* CCI_MACROS_S */ diff --git a/include/plat/marvell/common/aarch64/marvell_macros.S b/include/plat/marvell/common/aarch64/marvell_macros.S index faf10705f..c2a8bd055 100644 --- a/include/plat/marvell/common/aarch64/marvell_macros.S +++ b/include/plat/marvell/common/aarch64/marvell_macros.S @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MARVELL_MACROS_S__ -#define __MARVELL_MACROS_S__ +#ifndef MARVELL_MACROS_S +#define MARVELL_MACROS_S #include <cci.h> #include <gic_common.h> @@ -131,4 +131,4 @@ cci_iface_regs: .endm -#endif /* __MARVELL_MACROS_S__ */ +#endif /* MARVELL_MACROS_S */ diff --git a/include/plat/marvell/common/marvell_plat_priv.h b/include/plat/marvell/common/marvell_plat_priv.h index c1dad0ef4..6f0b588a7 100644 --- a/include/plat/marvell/common/marvell_plat_priv.h +++ b/include/plat/marvell/common/marvell_plat_priv.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MARVELL_PLAT_PRIV_H__ -#define __MARVELL_PLAT_PRIV_H__ +#ifndef MARVELL_PLAT_PRIV_H +#define MARVELL_PLAT_PRIV_H #include <utils.h> @@ -31,4 +31,4 @@ void plat_marvell_gic_irq_restore(void); void plat_marvell_gic_irq_pcpu_save(void); void plat_marvell_gic_irq_pcpu_restore(void); -#endif /* __MARVELL_PLAT_PRIV_H__ */ +#endif /* MARVELL_PLAT_PRIV_H */ diff --git a/include/plat/marvell/common/marvell_pm.h b/include/plat/marvell/common/marvell_pm.h index 2817a4626..8f1660755 100644 --- a/include/plat/marvell/common/marvell_pm.h +++ b/include/plat/marvell/common/marvell_pm.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef _MARVELL_PM_H_ -#define _MARVELL_PM_H_ +#ifndef MARVELL_PM_H +#define MARVELL_PM_H #define MVEBU_MAILBOX_MAGIC_NUM PLAT_MARVELL_MAILBOX_MAGIC_NUM #define MVEBU_MAILBOX_SUSPEND_STATE 0xb007de7c @@ -23,4 +23,4 @@ /* BLE execution start counter value */ #define MBOX_IDX_START_CNT 4 -#endif /* _MARVELL_PM_H_ */ +#endif /* MARVELL_PM_H */ diff --git a/include/plat/marvell/common/mvebu.h b/include/plat/marvell/common/mvebu.h index a7d6c3fc2..35a0200ad 100644 --- a/include/plat/marvell/common/mvebu.h +++ b/include/plat/marvell/common/mvebu.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef _MVEBU_H_ -#define _MVEBU_H_ +#ifndef MVEBU_H +#define MVEBU_H /* Use this functions only when printf is allowed */ #define debug_enter() VERBOSE("----> Enter %s\n", __func__) @@ -36,4 +36,4 @@ #define _1GB_ (_1MB_ * 1024ULL) #define _2GB_ (2 * _1GB_) -#endif /* MVEBU_H */ +#endif /* MVEBU_H */ diff --git a/include/services/arm_arch_svc.h b/include/services/arm_arch_svc.h index 0d2f47745..23c6f5660 100644 --- a/include/services/arm_arch_svc.h +++ b/include/services/arm_arch_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ARM_ARCH_SVC_H__ -#define __ARM_ARCH_SVC_H__ +#ifndef ARM_ARCH_SVC_H +#define ARM_ARCH_SVC_H #define SMCCC_VERSION U(0x80000000) #define SMCCC_ARCH_FEATURES U(0x80000001) @@ -14,4 +14,4 @@ #define SMCCC_ARCH_NOT_REQUIRED -2 -#endif /* __ARM_ARCH_SVC_H__ */ +#endif /* ARM_ARCH_SVC_H */ diff --git a/include/services/mm_svc.h b/include/services/mm_svc.h index 7a8a3eba5..ed2b32450 100644 --- a/include/services/mm_svc.h +++ b/include/services/mm_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MM_SVC_H__ -#define __MM_SVC_H__ +#ifndef MM_SVC_H +#define MM_SVC_H #include <utils_def.h> @@ -28,4 +28,4 @@ #define MM_COMMUNICATE_AARCH64 U(0xC4000041) #define MM_COMMUNICATE_AARCH32 U(0x84000041) -#endif /* __MM_SVC_H__ */ +#endif /* MM_SVC_H */ diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index 8b0adc80b..d565e0c57 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SECURE_PARTITION_H__ -#define __SECURE_PARTITION_H__ +#ifndef SECURE_PARTITION_H +#define SECURE_PARTITION_H #include <stdint.h> #include <utils_def.h> @@ -46,4 +46,4 @@ typedef struct secure_partition_boot_info { secure_partition_mp_info_t *mp_info; } secure_partition_boot_info_t; -#endif /* __SECURE_PARTITION_H__ */ +#endif /* SECURE_PARTITION_H */ diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h index 0200992c1..7a69b2828 100644 --- a/include/services/spm_svc.h +++ b/include/services/spm_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_SVC_H__ -#define __SPM_SVC_H__ +#ifndef SPM_SVC_H +#define SPM_SVC_H #include <utils_def.h> @@ -79,4 +79,4 @@ uint64_t spm_sp_call(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3); #endif /* __ASSEMBLY__ */ -#endif /* __SPM_SVC_H__ */ +#endif /* SPM_SVC_H */ diff --git a/include/services/std_svc.h b/include/services/std_svc.h index 9fe70ccce..b0614fb42 100644 --- a/include/services/std_svc.h +++ b/include/services/std_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STD_SVC_H__ -#define __STD_SVC_H__ +#ifndef STD_SVC_H +#define STD_SVC_H /* SMC function IDs for Standard Service queries */ @@ -27,4 +27,4 @@ */ uintptr_t get_arm_std_svc_args(unsigned int svc_mask); -#endif /* __STD_SVC_H__ */ +#endif /* STD_SVC_H */ diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h index b1ce56af6..9f586b0aa 100644 --- a/include/tools_share/firmware_image_package.h +++ b/include/tools_share/firmware_image_package.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __FIRMWARE_IMAGE_PACKAGE_H__ -#define __FIRMWARE_IMAGE_PACKAGE_H__ +#ifndef FIRMWARE_IMAGE_PACKAGE_H +#define FIRMWARE_IMAGE_PACKAGE_H #include <stdint.h> #include <uuid.h> @@ -88,4 +88,4 @@ typedef struct fip_toc_entry { uint64_t flags; } fip_toc_entry_t; -#endif /* __FIRMWARE_IMAGE_PACKAGE_H__ */ +#endif /* FIRMWARE_IMAGE_PACKAGE_H */ diff --git a/include/tools_share/tbbr_oid.h b/include/tools_share/tbbr_oid.h index b0b95e420..6bccfdd1e 100644 --- a/include/tools_share/tbbr_oid.h +++ b/include/tools_share/tbbr_oid.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TBBR_OID_H__ -#define __TBBR_OID_H__ +#ifndef TBBR_OID_H +#define TBBR_OID_H /* * The following is a list of OID values defined and reserved by ARM, which @@ -145,4 +145,4 @@ /* NonTrustedFirmwareConfigHash - NT_FW_CONFIG */ #define NON_TRUSTED_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.1202" -#endif /* __TBBR_OID_H__ */ +#endif /* TBBR_OID_H */ diff --git a/include/tools_share/uuid.h b/include/tools_share/uuid.h index f3ac4af5f..7d0043206 100644 --- a/include/tools_share/uuid.h +++ b/include/tools_share/uuid.h @@ -31,8 +31,8 @@ * All rights reserved. */ -#ifndef _SYS_UUID_H_ -#define _SYS_UUID_H_ +#ifndef UUID_H +#define UUID_H /* Length of a node address (an IEEE 802 address). */ #define _UUID_NODE_LEN 6 @@ -59,4 +59,4 @@ struct uuid { /* XXX namespace pollution? */ typedef struct uuid uuid_t; -#endif /* _SYS_UUID_H_ */ +#endif /* UUID_H */ |