From 144c3f5e4b76bf42971fffe5d7e0ac69405ec55b Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 11 May 2017 14:19:55 +0100 Subject: [PATCH 1/2] FVP: Break circular dependency in platform header files We used to have the following circular dependency in the FVP platform header files: +-> arm_def.h ---> platform_def.h ---> fvp_def.h --+ |__________________________________________________| This patch breaks it by not including 'arm_def.h' from 'fvp_def.h'. Change-Id: I280d906559e3343dd38764029e77c0ea768b4fec Signed-off-by: Sandrine Bailleux --- plat/arm/board/fvp/fvp_def.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h index 42de528e0..d4f9d925f 100644 --- a/plat/arm/board/fvp/fvp_def.h +++ b/plat/arm/board/fvp/fvp_def.h @@ -7,8 +7,6 @@ #ifndef __FVP_DEF_H__ #define __FVP_DEF_H__ -#include - #ifndef FVP_CLUSTER_COUNT #define FVP_CLUSTER_COUNT 2 #endif From 24c287be896c1bd7eead09f5c90b52485fcfc1e5 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 11 May 2017 14:30:20 +0100 Subject: [PATCH 2/2] Tegra: Break circular dependency in platform header files For SoCs T132 and T210, the header file 'platform_def.h' used to include 'tegra_def.h' and vice versa. This patch breaks this circular dependency by making 'tegra_def.h' independent. Change-Id: I45a00a84e6ab8b93d5e9242a9ff65f03e9102a96 Signed-off-by: Sandrine Bailleux --- plat/nvidia/tegra/include/t132/tegra_def.h | 2 -- plat/nvidia/tegra/include/t210/tegra_def.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/plat/nvidia/tegra/include/t132/tegra_def.h b/plat/nvidia/tegra/include/t132/tegra_def.h index 065989d32..fcb074a78 100644 --- a/plat/nvidia/tegra/include/t132/tegra_def.h +++ b/plat/nvidia/tegra/include/t132/tegra_def.h @@ -7,8 +7,6 @@ #ifndef __TEGRA_DEF_H__ #define __TEGRA_DEF_H__ -#include - /******************************************************************************* * This value is used by the PSCI implementation during the `SYSTEM_SUSPEND` * call as the `state-id` field in the 'power state' parameter. diff --git a/plat/nvidia/tegra/include/t210/tegra_def.h b/plat/nvidia/tegra/include/t210/tegra_def.h index 641585b14..efa2d5010 100644 --- a/plat/nvidia/tegra/include/t210/tegra_def.h +++ b/plat/nvidia/tegra/include/t210/tegra_def.h @@ -7,8 +7,6 @@ #ifndef __TEGRA_DEF_H__ #define __TEGRA_DEF_H__ -#include - /******************************************************************************* * Power down state IDs ******************************************************************************/