Skip to content

GitLab

Commit 5c330967 authored by Mark Dykes's avatar Mark Dykes Committed by TrustedFirmware Code Review
Browse files

Merge "FVP: Remove re-definition of topology related build options" into integration

parents 865054dc 94f1c959
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
+4 -4
plat/arm/board/fvp/fvp_def.h
View file @ 5c330967
/* /*
* 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