Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-20 11:34:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "refactor(qemu): handle pointer authentication" into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2023-08-23 16:04:10 +02:00 • committed by TrustedFirmware Code Review
commit 9e14faacdd
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plat/qemu/common/common.mk
View file

@ -102,4 +102,11 @@ CTX_INCLUDE_AARCH32_REGS := 0
ifeq (${CTX_INCLUDE_AARCH32_REGS}, 1) ifeq (${CTX_INCLUDE_AARCH32_REGS}, 1)
$(error "This is an AArch64-only port; CTX_INCLUDE_AARCH32_REGS must be disabled") $(error "This is an AArch64-only port; CTX_INCLUDE_AARCH32_REGS must be disabled")
endif endif
# Pointer Authentication sources
ifeq (${ENABLE_PAUTH}, 1)
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c
CTX_INCLUDE_PAUTH_REGS := 1
endif
endif endif

6
plat/qemu/qemu/platform.mk
View file

@ -158,12 +158,6 @@ ifeq (${SDEI_SUPPORT}, 1)
BL31_SOURCES += plat/qemu/common/qemu_sdei.c BL31_SOURCES += plat/qemu/common/qemu_sdei.c
endif endif
# Pointer Authentication sources
ifeq (${ENABLE_PAUTH}, 1)
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c \
lib/extensions/pauth/pauth_helpers.S
endif
ifeq (${SPD},spmd) ifeq (${SPD},spmd)
BL31_SOURCES += plat/common/plat_spmd_manifest.c \ BL31_SOURCES += plat/common/plat_spmd_manifest.c \
common/uuid.c \ common/uuid.c \