Commit d655d018 authored by Grant Likely's avatar Grant Likely
Browse files

Rename edk2 targets to be consistent and not match real files



edk2/BaseTools is a real directory, so using that as a target means the
target won't get built. Also the stmm target is built from the edk2
tree, so it makes sense to prefix the target with 'edk2-'. Change both
targets to be prefixed with 'edk2-' which should not conflict with the
directory name and can be set up as .PHONY targets.
Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@arm.com>
parent 2fd3334a
...@@ -205,16 +205,17 @@ export ACTIVE_PLATFORM=Platform/StMMRpmb/PlatformStandaloneMm.dsc ...@@ -205,16 +205,17 @@ export ACTIVE_PLATFORM=Platform/StMMRpmb/PlatformStandaloneMm.dsc
STMM_FD := $(EDK2_OUTPUT)/MmStandaloneRpmb/DEBUG_GCC5/FV/BL32_AP_MM.fd STMM_FD := $(EDK2_OUTPUT)/MmStandaloneRpmb/DEBUG_GCC5/FV/BL32_AP_MM.fd
# Tell optee where to find StMM PHONY += edk2-basetools edk2-stmm
OPTEE_EXTRA += CFG_STMM_PATH=$(STMM_FD) edk2-basetools:
optee_os/all: stmm/all $(STMM_FD)
edk2/BaseTools:
source $(EDK2_PATH)/edksetup.sh && $(MAKE) -C $(EDK2_PATH)/BaseTools source $(EDK2_PATH)/edksetup.sh && $(MAKE) -C $(EDK2_PATH)/BaseTools
stmm/all: edk2/BaseTools edk2-stmm: edk2-basetools
source $(EDK2_PATH)/edksetup.sh && build -p $(ACTIVE_PLATFORM) -b DEBUG -a AARCH64 -t GCC5 -D DO_X86EMU=TRUE source $(EDK2_PATH)/edksetup.sh && build -p $(ACTIVE_PLATFORM) -b DEBUG -a AARCH64 -t GCC5 -D DO_X86EMU=TRUE
# Tell optee where to find StMM and add it as a dependency
OPTEE_EXTRA += CFG_STMM_PATH=$(STMM_FD)
optee_os/all: edk2-stmm
endif # ifeq($(CONFIG_EFI_MM_COMM_TEE),y) endif # ifeq($(CONFIG_EFI_MM_COMM_TEE),y)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -308,3 +309,6 @@ u-boot/%: ...@@ -308,3 +309,6 @@ u-boot/%:
endif #ifeq ($(mixed-targets),1) endif #ifeq ($(mixed-targets),1)
# Declare the contents of the PHONY variable as phony. We keep that
# information in a variable so we can use it in if_changed and friends.
.PHONY: $(PHONY)
Supports Markdown
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