From 94f1c9593d3956c77d0cf17239185e50ba258bfa Mon Sep 17 00:00:00 2001 From: Alexei Fedorov Date: Fri, 10 Jan 2020 14:24:17 +0000 Subject: [PATCH] FVP: Remove re-definition of topology related build options This patch removes re-definition of the following FVP build options from plat\arm\board\fvp\fvp_def.h: 'FVP_CLUSTER_COUNT' 'FVP_MAX_CPUS_PER_CLUSTER' 'FVP_MAX_PE_PER_CPU' which are set in platform.mk. This fixes a potential problem when a build option set in platform.mk file can be re-defined in fvp_def.h header file used by other build component with a different makefile which does not set this option. Ref. GENFW-3505. Change-Id: I4288629920516acf2c239c7b733f92a0c5a812ff Signed-off-by: Alexei Fedorov --- plat/arm/board/fvp/fvp_def.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h index 1b9f84b00..347ba2e1e 100644 --- a/plat/arm/board/fvp/fvp_def.h +++ b/plat/arm/board/fvp/fvp_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,15 +10,15 @@ #include #ifndef FVP_CLUSTER_COUNT -#define FVP_CLUSTER_COUNT 2 +#error "FVP_CLUSTER_COUNT is not set in makefile" #endif #ifndef FVP_MAX_CPUS_PER_CLUSTER -#define FVP_MAX_CPUS_PER_CLUSTER 4 +#error "FVP_MAX_CPUS_PER_CLUSTER is not set in makefile" #endif #ifndef FVP_MAX_PE_PER_CPU -# define FVP_MAX_PE_PER_CPU 1 +#error "FVP_MAX_PE_PER_CPU is not set in makefile" #endif #define FVP_PRIMARY_CPU 0x0