Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
9d068f66
Unverified
Commit
9d068f66
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1673 from antonio-nino-diaz-arm/an/headers
Standardise header guards across codebase
parents
f5ae1b0e
c3cf06f1
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
508
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
include/drivers/st/stm32_i2c.h
+3
-3
include/drivers/st/stm32_i2c.h
include/drivers/st/stm32mp1_clk.h
+3
-3
include/drivers/st/stm32mp1_clk.h
include/drivers/st/stm32mp1_clkfunc.h
+3
-3
include/drivers/st/stm32mp1_clkfunc.h
include/drivers/st/stm32mp1_ddr.h
+4
-3
include/drivers/st/stm32mp1_ddr.h
include/drivers/st/stm32mp1_ddr_helpers.h
+3
-3
include/drivers/st/stm32mp1_ddr_helpers.h
include/drivers/st/stm32mp1_ddr_regs.h
+3
-3
include/drivers/st/stm32mp1_ddr_regs.h
include/drivers/st/stm32mp1_pmic.h
+3
-3
include/drivers/st/stm32mp1_pmic.h
include/drivers/st/stm32mp1_pwr.h
+3
-3
include/drivers/st/stm32mp1_pwr.h
include/drivers/st/stm32mp1_ram.h
+3
-3
include/drivers/st/stm32mp1_ram.h
include/drivers/st/stm32mp1_rcc.h
+3
-3
include/drivers/st/stm32mp1_rcc.h
include/drivers/st/stm32mp1_reset.h
+3
-3
include/drivers/st/stm32mp1_reset.h
include/drivers/st/stpmu1.h
+3
-4
include/drivers/st/stpmu1.h
include/drivers/synopsys/dw_mmc.h
+3
-3
include/drivers/synopsys/dw_mmc.h
include/drivers/ti/uart/uart_16550.h
+3
-3
include/drivers/ti/uart/uart_16550.h
include/drivers/ufs.h
+3
-3
include/drivers/ufs.h
include/lib/aarch32/arch.h
+3
-3
include/lib/aarch32/arch.h
include/lib/aarch32/smccc_helpers.h
+3
-3
include/lib/aarch32/smccc_helpers.h
include/lib/aarch32/smccc_macros.S
+3
-3
include/lib/aarch32/smccc_macros.S
include/lib/aarch64/setjmp.h
+3
-3
include/lib/aarch64/setjmp.h
include/lib/aarch64/smccc_helpers.h
+3
-3
include/lib/aarch64/smccc_helpers.h
with
61 additions
and
61 deletions
+61
-61
include/drivers/st/stm32_i2c.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
STM32
MP1
_I2C_H
#define
__
STM32
MP1
_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
/*
__
STM32
MP1
_I2C_H */
#endif
/* STM32_I2C_H */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_clk.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_clkfunc.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_ddr.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_ddr_helpers.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_ddr_regs.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_pmic.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_pwr.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_ram.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_rcc.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32mp1_reset.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stpmu1.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/synopsys/dw_mmc.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/ti/uart/uart_16550.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/ufs.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/lib/aarch32/arch.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/lib/aarch32/smccc_helpers.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/lib/aarch32/smccc_macros.S
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/lib/aarch64/setjmp.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
JMP_H
__
#define
__
JMP_H
__
#ifndef
SET
JMP_H
#define
SET
JMP_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
/*
SET
JMP_H */
This diff is collapsed.
Click to expand it.
include/lib/aarch64/smccc_helpers.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
Prev
1
…
4
5
6
7
8
9
10
11
12
…
26
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help