Unverified Commit 9a207532 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

Merge pull request #1726 from antonio-nino-diaz-arm/an/includes

Sanitise includes across codebase
parents 3f99f7e4 8e7b27a4
......@@ -8,10 +8,10 @@
#ifndef ARMADA_COMMON_H
#define ARMADA_COMMON_H
#include <amb_adec.h>
#include <io_win.h>
#include <iob.h>
#include <ccu.h>
#include <drivers/marvell/amb_adec.h>
#include <drivers/marvell/ccu.h>
#include <drivers/marvell/io_win.h>
#include <drivers/marvell/iob.h>
/*
* This struct supports skip image request
......
......@@ -8,12 +8,12 @@
#ifndef MARVELL_DEF_H
#define MARVELL_DEF_H
#include <arch.h>
#include <common_def.h>
#include <platform_def.h>
#include <tbbr_img_def.h>
#include <xlat_tables.h>
#include <arch.h>
#include <common/tbbr/tbbr_img_def.h>
#include <lib/xlat_tables/xlat_tables.h>
#include <plat/common/common_def.h>
/******************************************************************************
* Definitions common to all MARVELL standard platforms
......
......@@ -8,11 +8,12 @@
#ifndef PLAT_MARVELL_H
#define PLAT_MARVELL_H
#include <cassert.h>
#include <cpu_data.h>
#include <stdint.h>
#include <utils.h>
#include <xlat_tables.h>
#include <lib/cassert.h>
#include <lib/el3_runtime/cpu_data.h>
#include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables.h>
/*
* Extern declarations common to Marvell standard platforms
......
......@@ -8,7 +8,7 @@
#ifndef CCI_MACROS_S
#define CCI_MACROS_S
#include <cci.h>
#include <drivers/arm/cci.h>
#include <platform_def.h>
.section .rodata.cci_reg_name, "aS"
......
......@@ -8,10 +8,10 @@
#ifndef MARVELL_MACROS_S
#define MARVELL_MACROS_S
#include <cci.h>
#include <gic_common.h>
#include <gicv2.h>
#include <gicv3.h>
#include <drivers/arm/cci.h>
#include <drivers/arm/gic_common.h>
#include <drivers/arm/gicv2.h>
#include <drivers/arm/gicv3.h>
#include <platform_def.h>
/*
......
......@@ -8,7 +8,7 @@
#ifndef MARVELL_PLAT_PRIV_H
#define MARVELL_PLAT_PRIV_H
#include <utils.h>
#include <lib/utils.h>
/*****************************************************************************
* Function and variable prototypes
......
......@@ -9,7 +9,7 @@
#if SPM_DEPRECATED
#include <utils_def.h>
#include <lib/utils_def.h>
#define MM_VERSION_MAJOR U(1)
#define MM_VERSION_MAJOR_SHIFT 16
......
......@@ -7,8 +7,8 @@
#ifndef SDEI_H
#define SDEI_H
#include <spinlock.h>
#include <utils_def.h>
#include <lib/spinlock.h>
#include <lib/utils_def.h>
/* Range 0xC4000020 - 0xC400003F reserved for SDE 64bit smc calls */
#define SDEI_VERSION 0xC4000020U
......
......@@ -10,7 +10,8 @@
#if SPM_DEPRECATED
#include <stdint.h>
#include <utils_def.h>
#include <lib/utils_def.h>
/*
* Flags used by the secure_partition_mp_info structure to describe the
......
......@@ -8,7 +8,8 @@
#define SPM_RES_DESC_H
#include <stdint.h>
#include <sp_res_desc_def.h>
#include <services/sp_res_desc_def.h>
/*******************************************************************************
* Attribute Section
......
......@@ -7,7 +7,7 @@
#ifndef SPM_RES_DESC_DEFS_H
#define SPM_RES_DESC_DEFS_H
#include <utils_def.h>
#include <lib/utils_def.h>
/*******************************************************************************
* Attribute Section
......
......@@ -7,8 +7,8 @@
#ifndef SPCI_SVC_H
#define SPCI_SVC_H
#include <smccc.h>
#include <utils_def.h>
#include <lib/smccc.h>
#include <lib/utils_def.h>
/* SPCI_VERSION helpers */
......
......@@ -9,7 +9,7 @@
#if SPM_DEPRECATED
#include <utils_def.h>
#include <lib/utils_def.h>
#define SPM_VERSION_MAJOR U(0)
#define SPM_VERSION_MAJOR_SHIFT 16
......
......@@ -7,8 +7,8 @@
#ifndef SPRT_SVC_H
#define SPRT_SVC_H
#include <smccc.h>
#include <utils_def.h>
#include <lib/smccc.h>
#include <lib/utils_def.h>
/* SPRT_VERSION helpers */
......
......@@ -8,7 +8,8 @@
#define FIRMWARE_IMAGE_PACKAGE_H
#include <stdint.h>
#include <uuid.h>
#include "uuid.h"
/* This is used as a signature to validate the blob header */
#define TOC_HEADER_NAME 0xAA640001
......
......@@ -7,7 +7,7 @@
#include <arch.h>
#include <asm_macros.S>
#include <assert_macros.S>
#include <xlat_tables_defs.h>
#include <lib/xlat_tables/xlat_tables_defs.h>
#if !ERROR_DEPRECATED
.globl get_afflvl_shift
......
......@@ -19,6 +19,4 @@ BL31_SOURCES += $(addprefix lib/coreboot/, \
BL31_SOURCES += drivers/coreboot/cbmem_console/${ARCH}/cbmem_console.S
INCLUDES += -Iinclude/drivers/coreboot
endif # COREBOOT
......@@ -5,12 +5,13 @@
*/
#include <assert.h>
#include <cbmem_console.h>
#include <coreboot.h>
#include <debug.h>
#include <mmio.h>
#include <string.h>
#include <xlat_tables_v2.h>
#include <drivers/coreboot/cbmem_console.h>
#include <common/debug.h>
#include <lib/coreboot.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
/*
* Structures describing coreboot's in-memory descriptor tables. See
......
......@@ -3,12 +3,13 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <arch.h>
#include <asm_macros.S>
#include <assert_macros.S>
#include <common/debug.h>
#include <cortex_a53.h>
#include <cpu_macros.S>
#include <debug.h>
#if A53_DISABLE_NON_TEMPORAL_HINT
#undef ERRATA_A53_836870
......
......@@ -6,9 +6,9 @@
#include <arch.h>
#include <asm_macros.S>
#include <assert_macros.S>
#include <common/debug.h>
#include <cortex_a57.h>
#include <cpu_macros.S>
#include <debug.h>
/* ---------------------------------------------
* Disable intra-cluster coherency
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment