diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-12-14 00:18:21 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-04 10:43:17 +0000 |
commit | 09d40e0e08283a249e7dce0e106c07c5141f9b7e (patch) | |
tree | 46e7af7b5be2738948b359b2a07078e4cf1bbec1 /plat/renesas | |
parent | f5478dedf9e096d9539362b38ceb096b940ba3e2 (diff) |
Sanitise includes across codebase
Enforce full include path for includes. Deprecate old paths.
The following folders inside include/lib have been left unchanged:
- include/lib/cpus/${ARCH}
- include/lib/el3_runtime/${ARCH}
The reason for this change is that having a global namespace for
includes isn't a good idea. It defeats one of the advantages of having
folders and it introduces problems that are sometimes subtle (because
you may not know the header you are actually including if there are two
of them).
For example, this patch had to be created because two headers were
called the same way: e0ea0928d5b7 ("Fix gpio includes of mt8173 platform
to avoid collision."). More recently, this patch has had similar
problems: 46f9b2c3a282 ("drivers: add tzc380 support").
This problem was introduced in commit 4ecca33988b9 ("Move include and
source files to logical locations"). At that time, there weren't too
many headers so it wasn't a real issue. However, time has shown that
this creates problems.
Platforms that want to preserve the way they include headers may add the
removed paths to PLAT_INCLUDES, but this is discouraged.
Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/renesas')
-rw-r--r-- | plat/renesas/rcar/aarch64/plat_helpers.S | 5 | ||||
-rw-r--r-- | plat/renesas/rcar/aarch64/platform_common.c | 20 | ||||
-rw-r--r-- | plat/renesas/rcar/bl2_cpg_init.c | 5 | ||||
-rw-r--r-- | plat/renesas/rcar/bl2_interrupt_error.c | 11 | ||||
-rw-r--r-- | plat/renesas/rcar/bl2_plat_mem_params_desc.c | 9 | ||||
-rw-r--r-- | plat/renesas/rcar/bl2_plat_setup.c | 23 | ||||
-rw-r--r-- | plat/renesas/rcar/bl2_secure_setting.c | 5 | ||||
-rw-r--r-- | plat/renesas/rcar/bl31_plat_setup.c | 18 | ||||
-rw-r--r-- | plat/renesas/rcar/include/plat.ld.S | 2 | ||||
-rw-r--r-- | plat/renesas/rcar/include/plat_macros.S | 7 | ||||
-rw-r--r-- | plat/renesas/rcar/include/platform_def.h | 4 | ||||
-rw-r--r-- | plat/renesas/rcar/include/rcar_def.h | 4 | ||||
-rw-r--r-- | plat/renesas/rcar/include/rcar_private.h | 7 | ||||
-rw-r--r-- | plat/renesas/rcar/plat_image_load.c | 6 | ||||
-rw-r--r-- | plat/renesas/rcar/plat_pm.c | 20 | ||||
-rw-r--r-- | plat/renesas/rcar/plat_storage.c | 13 | ||||
-rw-r--r-- | plat/renesas/rcar/plat_topology.c | 5 |
17 files changed, 93 insertions, 71 deletions
diff --git a/plat/renesas/rcar/aarch64/plat_helpers.S b/plat/renesas/rcar/aarch64/plat_helpers.S index 7e1ff8dd..d40f8f2e 100644 --- a/plat/renesas/rcar/aarch64/plat_helpers.S +++ b/plat/renesas/rcar/aarch64/plat_helpers.S @@ -7,10 +7,11 @@ #include <arch.h> #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> +#include <common/runtime_svc.h> #include <cortex_a57.h> #include <platform_def.h> -#include <runtime_svc.h> + #include "rcar_def.h" .globl plat_get_my_entrypoint diff --git a/plat/renesas/rcar/aarch64/platform_common.c b/plat/renesas/rcar/aarch64/platform_common.c index f344b375..647a562c 100644 --- a/plat/renesas/rcar/aarch64/platform_common.c +++ b/plat/renesas/rcar/aarch64/platform_common.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> #include <arch_helpers.h> -#include <bl_common.h> -#include <debug.h> -#include <gicv2.h> -#include <gic_common.h> -#include <interrupt_props.h> -#include <mmio.h> -#include <platform.h> -#include <platform_def.h> -#include <xlat_tables_v2.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/gic_common.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables_v2.h> +#include <plat/common/platform.h> + #include "rcar_def.h" #include "rcar_private.h" #include "rcar_version.h" diff --git a/plat/renesas/rcar/bl2_cpg_init.c b/plat/renesas/rcar/bl2_cpg_init.c index 880ad360..883fc9a1 100644 --- a/plat/renesas/rcar/bl2_cpg_init.c +++ b/plat/renesas/rcar/bl2_cpg_init.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <mmio.h> +#include <common/debug.h> +#include <lib/mmio.h> + #include "rcar_def.h" #include "cpg_registers.h" #include "rcar_private.h" diff --git a/plat/renesas/rcar/bl2_interrupt_error.c b/plat/renesas/rcar/bl2_interrupt_error.c index c50c6037..2346017d 100644 --- a/plat/renesas/rcar/bl2_interrupt_error.c +++ b/plat/renesas/rcar/bl2_interrupt_error.c @@ -5,11 +5,12 @@ */ #include <arch_helpers.h> -#include <bl_common.h> -#include <debug.h> -#include <gicv2.h> -#include <mmio.h> -#include <runtime_svc.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <drivers/arm/gicv2.h> +#include <lib/mmio.h> + #include "rcar_def.h" #define SWDT_ERROR_ID (1024U) diff --git a/plat/renesas/rcar/bl2_plat_mem_params_desc.c b/plat/renesas/rcar/bl2_plat_mem_params_desc.c index 3dc9eff5..3b124c78 100644 --- a/plat/renesas/rcar/bl2_plat_mem_params_desc.c +++ b/plat/renesas/rcar/bl2_plat_mem_params_desc.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> #include <platform_def.h> -#include <xlat_tables_defs.h> + +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <lib/xlat_tables/xlat_tables_defs.h> +#include <plat/common/platform.h> #if (RCAR_BL33_EXECUTION_EL != 0) && (RCAR_BL33_EXECUTION_EL != 1) #error diff --git a/plat/renesas/rcar/bl2_plat_setup.c b/plat/renesas/rcar/bl2_plat_setup.c index 7567813c..77a5ed17 100644 --- a/plat/renesas/rcar/bl2_plat_setup.c +++ b/plat/renesas/rcar/bl2_plat_setup.c @@ -4,18 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <desc_image_load.h> -#include <arch_helpers.h> -#include <bl_common.h> -#include <bl1.h> -#include <console.h> -#include <debug.h> +#include <string.h> + #include <libfdt.h> -#include <mmio.h> -#include <platform.h> + #include <platform_def.h> -#include <string.h> -#include <xlat_tables_defs.h> + +#include <arch_helpers.h> +#include <bl1/bl1.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/desc_image_load.h> +#include <drivers/console.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables_defs.h> +#include <plat/common/platform.h> #include "avs_driver.h" #include "boot_init_dram.h" diff --git a/plat/renesas/rcar/bl2_secure_setting.c b/plat/renesas/rcar/bl2_secure_setting.c index c0d49deb..cbda1eb3 100644 --- a/plat/renesas/rcar/bl2_secure_setting.c +++ b/plat/renesas/rcar/bl2_secure_setting.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <lib/mmio.h> +#include <lib/utils_def.h> + #include "axi_registers.h" #include "lifec_registers.h" #include "micro_delay.h" -#include "mmio.h" -#include "utils_def.h" static void lifec_security_setting(void); static void axi_security_setting(void); diff --git a/plat/renesas/rcar/bl31_plat_setup.c b/plat/renesas/rcar/bl31_plat_setup.c index 00f6d100..6f31417b 100644 --- a/plat/renesas/rcar/bl31_plat_setup.c +++ b/plat/renesas/rcar/bl31_plat_setup.c @@ -5,16 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <stddef.h> + #include <arch.h> #include <arch_helpers.h> -#include <bl_common.h> -#include <bl31.h> -#include <cci.h> -#include <console.h> -#include <mmio.h> -#include <platform.h> -#include <stddef.h> -#include <debug.h> +#include <bl31/bl31.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/arm/cci.h> +#include <drivers/console.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include "pwrc.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/plat/renesas/rcar/include/plat.ld.S b/plat/renesas/rcar/include/plat.ld.S index 0461141f..7aef324c 100644 --- a/plat/renesas/rcar/include/plat.ld.S +++ b/plat/renesas/rcar/include/plat.ld.S @@ -6,8 +6,8 @@ #ifndef RCAR_PLAT_LD_S #define RCAR_PLAT_LD_S +#include <lib/xlat_tables/xlat_tables_defs.h> #include <platform_def.h> -#include <xlat_tables_defs.h> MEMORY { SRAM (rwx): ORIGIN = BL31_SRAM_BASE, LENGTH = DEVICE_SRAM_SIZE diff --git a/plat/renesas/rcar/include/plat_macros.S b/plat/renesas/rcar/include/plat_macros.S index eb109287..927cd39e 100644 --- a/plat/renesas/rcar/include/plat_macros.S +++ b/plat/renesas/rcar/include/plat_macros.S @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <cci.h> -#include <gic_common.h> -#include <gicv2.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv2.h> + #include "rcar_def.h" .section .rodata.gic_reg_name, "aS" diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h index fa6e474c..20fd7123 100644 --- a/plat/renesas/rcar/include/platform_def.h +++ b/plat/renesas/rcar/include/platform_def.h @@ -7,10 +7,12 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include <arch.h> #ifndef __ASSEMBLY__ #include <stdlib.h> #endif + +#include <arch.h> + #include "rcar_def.h" /******************************************************************************* diff --git a/plat/renesas/rcar/include/rcar_def.h b/plat/renesas/rcar/include/rcar_def.h index 61b95a43..242e007b 100644 --- a/plat/renesas/rcar/include/rcar_def.h +++ b/plat/renesas/rcar/include/rcar_def.h @@ -7,8 +7,8 @@ #ifndef RCAR_DEF_H #define RCAR_DEF_H -#include <tbbr_img_def.h> -#include <utils_def.h> +#include <common/tbbr/tbbr_img_def.h> +#include <lib/utils_def.h> #define RCAR_PRIMARY_CPU 0x0 #define RCAR_TRUSTED_SRAM_BASE 0x44000000 diff --git a/plat/renesas/rcar/include/rcar_private.h b/plat/renesas/rcar/include/rcar_private.h index e90fa08a..def32760 100644 --- a/plat/renesas/rcar/include/rcar_private.h +++ b/plat/renesas/rcar/include/rcar_private.h @@ -7,11 +7,12 @@ #ifndef RCAR_PRIVATE_H #define RCAR_PRIVATE_H -#include <bakery_lock.h> -#include <bl_common.h> -#include <cpu_data.h> #include <platform_def.h> +#include <common/bl_common.h> +#include <lib/bakery_lock.h> +#include <lib/el3_runtime/cpu_data.h> + typedef volatile struct mailbox { unsigned long value __aligned(CACHE_WRITEBACK_GRANULE); } mailbox_t; diff --git a/plat/renesas/rcar/plat_image_load.c b/plat/renesas/rcar/plat_image_load.c index 469ac29c..9d814a6e 100644 --- a/plat/renesas/rcar/plat_image_load.c +++ b/plat/renesas/rcar/plat_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> extern void bl2_plat_flush_bl31_params(void); diff --git a/plat/renesas/rcar/plat_pm.c b/plat/renesas/rcar/plat_pm.c index 84cc47e0..7086613f 100644 --- a/plat/renesas/rcar/plat_pm.c +++ b/plat/renesas/rcar/plat_pm.c @@ -4,17 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> -#include <bakery_lock.h> -#include <bl_common.h> -#include <cci.h> -#include <debug.h> #include <errno.h> -#include <gicv2.h> -#include <mmio.h> -#include <platform.h> + #include <platform_def.h> -#include <psci.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> +#include <plat/common/platform.h> #include "iic_dvfs.h" #include "pwrc.h" diff --git a/plat/renesas/rcar/plat_storage.c b/plat/renesas/rcar/plat_storage.c index 3b5d620d..05e3d9f0 100644 --- a/plat/renesas/rcar/plat_storage.c +++ b/plat/renesas/rcar/plat_storage.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <io_driver.h> -#include <io_storage.h> -#include <io_semihosting.h> -#include <platform_def.h> #include <string.h> + +#include <platform_def.h> + +#include <common/debug.h> +#include <drivers/io/io_driver.h> +#include <drivers/io/io_storage.h> +#include <drivers/io/io_semihosting.h> + #include "io_common.h" #include "io_rcar.h" #include "io_memdrv.h" diff --git a/plat/renesas/rcar/plat_topology.c b/plat/renesas/rcar/plat_topology.c index 3582c2bd..0d5880d7 100644 --- a/plat/renesas/rcar/plat_topology.c +++ b/plat/renesas/rcar/plat_topology.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> #include <platform_def.h> -#include <psci.h> + +#include <common/debug.h> +#include <lib/psci/psci.h> static const unsigned char rcar_power_domain_tree_desc[] = { 1, |