Commit 5b510ca2 authored by Grant Likely's avatar Grant Likely
Browse files

Fix output directory of EDK2



Fix build problems of not finding binary images because the output
directory was incorrectly set.
Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@arm.com>
parent 912ef02d
...@@ -23,7 +23,7 @@ UBOOT_PATH := $(CURDIR)/u-boot ...@@ -23,7 +23,7 @@ UBOOT_PATH := $(CURDIR)/u-boot
# Give the option of building in a separate directory # Give the option of building in a separate directory
ifneq ($(BUILD_OUTPUT),) ifneq ($(BUILD_OUTPUT),)
__BUILD := $(realpath $(BUILD_OUTPUT)) __BUILD := $(realpath $(BUILD_OUTPUT))
EDK2_OUTPUT := $(__BUILD)/edk2 EDK2_OUTPUT := $(__BUILD)/edk2/Build
OPTEE_OUTPUT := $(__BUILD)/optee_os OPTEE_OUTPUT := $(__BUILD)/optee_os
OPTEE_EXTRA += O=$(OPTEE_OUTPUT) OPTEE_EXTRA += O=$(OPTEE_OUTPUT)
TFA_OUTPUT := $(__BUILD)/tfa TFA_OUTPUT := $(__BUILD)/tfa
...@@ -31,7 +31,7 @@ ifneq ($(BUILD_OUTPUT),) ...@@ -31,7 +31,7 @@ ifneq ($(BUILD_OUTPUT),)
UBOOT_OUTPUT := $(__BUILD)/u-boot UBOOT_OUTPUT := $(__BUILD)/u-boot
UBOOT_EXTRA += KBUILD_OUTPUT=$(UBOOT_OUTPUT) UBOOT_EXTRA += KBUILD_OUTPUT=$(UBOOT_OUTPUT)
else else
EDK2_OUTPUT := $(EDK2_PATH) EDK2_OUTPUT := $(CURDIR)/Build
OPTEE_OUTPUT := $(OPTEE_PATH)/out OPTEE_OUTPUT := $(OPTEE_PATH)/out
TFA_OUTPUT := $(TFA_PATH)/build TFA_OUTPUT := $(TFA_PATH)/build
UBOOT_OUTPUT := $(UBOOT_PATH) UBOOT_OUTPUT := $(UBOOT_PATH)
......
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