Skip to content
GitLab
Menu
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
Changes
508
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
include/drivers/io/io_storage.h
+3
-3
include/drivers/io/io_storage.h
include/drivers/marvell/addr_map.h
+3
-3
include/drivers/marvell/addr_map.h
include/drivers/marvell/amb_adec.h
+3
-3
include/drivers/marvell/amb_adec.h
include/drivers/marvell/aro.h
+3
-3
include/drivers/marvell/aro.h
include/drivers/marvell/cache_llc.h
+3
-4
include/drivers/marvell/cache_llc.h
include/drivers/marvell/ccu.h
+3
-3
include/drivers/marvell/ccu.h
include/drivers/marvell/gwin.h
+3
-3
include/drivers/marvell/gwin.h
include/drivers/marvell/i2c.h
+4
-3
include/drivers/marvell/i2c.h
include/drivers/marvell/io_win.h
+3
-3
include/drivers/marvell/io_win.h
include/drivers/marvell/iob.h
+3
-3
include/drivers/marvell/iob.h
include/drivers/marvell/mci.h
+3
-3
include/drivers/marvell/mci.h
include/drivers/marvell/mochi/ap_setup.h
+3
-3
include/drivers/marvell/mochi/ap_setup.h
include/drivers/marvell/mochi/cp110_setup.h
+3
-3
include/drivers/marvell/mochi/cp110_setup.h
include/drivers/marvell/thermal.h
+3
-3
include/drivers/marvell/thermal.h
include/drivers/mentor/mi2cv.h
+4
-3
include/drivers/mentor/mi2cv.h
include/drivers/mmc.h
+3
-3
include/drivers/mmc.h
include/drivers/partition/gpt.h
+3
-3
include/drivers/partition/gpt.h
include/drivers/partition/mbr.h
+3
-3
include/drivers/partition/mbr.h
include/drivers/partition/partition.h
+3
-3
include/drivers/partition/partition.h
include/drivers/st/stm32_gpio.h
+3
-3
include/drivers/st/stm32_gpio.h
with
62 additions
and
61 deletions
+62
-61
include/drivers/io/io_storage.h
View file @
9d068f66
...
...
@@ -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
*/
This diff is collapsed.
Click to expand it.
include/drivers/marvell/addr_map.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/amb_adec.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/aro.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/cache_llc.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/ccu.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/gwin.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/i2c.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/io_win.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/iob.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/mci.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/mochi/ap_setup.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/mochi/cp110_setup.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/marvell/thermal.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/mentor/mi2cv.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/mmc.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/partition/gpt.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/partition/mbr.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/partition/partition.h
View file @
9d068f66
...
...
@@ -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 */
This diff is collapsed.
Click to expand it.
include/drivers/st/stm32_gpio.h
View file @
9d068f66
...
...
@@ -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
*/
This diff is collapsed.
Click to expand it.
Prev
1
…
3
4
5
6
7
8
9
10
11
…
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