edk2: Update QEMU v8 and FVP builds
QEMU v8 and FVP are both now working with upstream edk2 and
edk2-platforms. QEMU v8's dsc file is located in the edk2 folder whilst
the dsc for FVP is in the edk2-platforms folder. Due to this we had to
export the WORKSPACE variable differently otherwise we would get either
compiler errors or we would get the "Build" folder created on the top
level (something that we do not want).
Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU v8, FVP)
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/common.mk b/common.mk
index 12bf1a3..690499e 100644
--- a/common.mk
+++ b/common.mk
@@ -209,15 +209,15 @@
################################################################################
.PHONY: edk2-common
edk2-common:
- export WORKSPACE=$(ROOT) && \
- export PACKAGES_PATH=$(EDK2_PATH):$(ROOT)/edk2-platforms && \
+ $(call edk2-env) && \
+ export PACKAGES_PATH=$(EDK2_PATH):$(EDK2_PLATFORMS_PATH) && \
source $(EDK2_PATH)/edksetup.sh && \
$(MAKE) -j1 -C $(EDK2_PATH)/BaseTools && \
$(call edk2-call) all
.PHONY: edk2-clean-common
edk2-clean-common:
- export WORKSPACE=$(ROOT) && \
+ $(call edk2-env) && \
export PACKAGES_PATH=$(EDK2_PATH):$(ROOT)/edk2-platforms && \
source $(EDK2_PATH)/edksetup.sh && \
$(MAKE) -j1 -C $(EDK2_PATH)/BaseTools clean && \