Commit 94f1c959 authored by Alexei Fedorov's avatar Alexei Fedorov
Browse files

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: default avatarAlexei Fedorov <Alexei.Fedorov@arm.com>
parent 22d12c41
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -10,15 +10,15 @@ ...@@ -10,15 +10,15 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#ifndef FVP_CLUSTER_COUNT #ifndef FVP_CLUSTER_COUNT
#define FVP_CLUSTER_COUNT 2 #error "FVP_CLUSTER_COUNT is not set in makefile"
#endif #endif
#ifndef FVP_MAX_CPUS_PER_CLUSTER #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 #endif
#ifndef FVP_MAX_PE_PER_CPU #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 #endif
#define FVP_PRIMARY_CPU 0x0 #define FVP_PRIMARY_CPU 0x0
......
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