fix(rmmd): avoid TRP when external RMM is defined

The Test Realm Package (TRP) is a small payload that runs at R-EL2 if an
external RMM image path is not provided. Currently, the TRP makefile is
included if RME is enabled, regardless of whether an external RMM
image path is defined or not. This fix ensures that TRP is included
only when an external RMM path is not defined.

Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I3cc3d2a636e65071e45c5c82cc125290887ffc09
This commit is contained in:
Rohit Mathew 2023-11-27 10:50:39 +00:00
parent d54e6696d7
commit 57bc3c4056

View file

@ -1,5 +1,5 @@
#
# Copyright (c) 2021-2022, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2021-2024, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@ -8,7 +8,10 @@ ifneq (${ARCH},aarch64)
$(error "Error: RMMD is only supported on aarch64.")
endif
include services/std_svc/rmmd/trp/trp.mk
# Include TRP makefile only if RMM is not defined.
ifeq ($(RMM),)
include services/std_svc/rmmd/trp/trp.mk
endif
RMMD_SOURCES += $(addprefix services/std_svc/rmmd/, \
${ARCH}/rmmd_helpers.S \