aboutsummaryrefslogtreecommitdiff
path: root/plat/arm
diff options
context:
space:
mode:
authorAndré Przywara <andre.przywara@arm.com>2020-09-28 18:25:03 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-09-28 18:25:03 +0000
commit478fc4f238f82503738c30ec0e9a857f35ca0ecd (patch)
tree155d3afbc1fc90c9270788756774b047b2d39466 /plat/arm
parente89b813129fca7276e23182d2c7ebbf774010d9d (diff)
parent1994e56221f06b47b3b38fba0a148ea505c940cd (diff)
downloadtrusted-firmware-a-478fc4f238f82503738c30ec0e9a857f35ca0ecd.tar.gz
Merge "arm_fpga: Add support for unknown MPIDs" into integration
Diffstat (limited to 'plat/arm')
-rw-r--r--plat/arm/board/arm_fpga/platform.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/plat/arm/board/arm_fpga/platform.mk b/plat/arm/board/arm_fpga/platform.mk
index 8904339835..8f0ff0bb82 100644
--- a/plat/arm/board/arm_fpga/platform.mk
+++ b/plat/arm/board/arm_fpga/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -40,6 +40,8 @@ HW_ASSISTED_COHERENCY := 1
PL011_GENERIC_UART := 1
+SUPPORT_UNKNOWN_MPID ?= 1
+
FPGA_CPU_LIBS := lib/cpus/${ARCH}/aem_generic.S
# select a different set of CPU files, depending on whether we compile for
@@ -71,6 +73,12 @@ else
lib/cpus/aarch64/cortex_a75.S
endif
+ifeq (${SUPPORT_UNKNOWN_MPID}, 1)
+# Add support for unknown/invalid MPIDs (aarch64 only)
+$(eval $(call add_define,SUPPORT_UNKNOWN_MPID))
+ FPGA_CPU_LIBS += lib/cpus/aarch64/generic.S
+endif
+
# Allow detection of GIC-600
GICV3_SUPPORT_GIC600 := 1