summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-01-22 15:49:16 +0000
committerJon Medhurst <tixy@linaro.org>2013-01-22 15:49:16 +0000
commit002e64fc74612b8cea4582f03129d5d3d464e80a (patch)
treefef23ec281b08eb2e541dd8b21b259791901c412
parente1ffb04195057f5eb20f45aec89a7471f4af0b3f (diff)
bootloader.mk: Fix UEFI make rules so gold linker is not used
The hacks in the UEFI make rules to stop it using the gold linker had a couple or errors which meant it still used gold. This produced UEFI ROMs which didn't boot. Change-Id: I7fe04345e4d6194200cee419a786dd210acfca33 Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--tasks/bootloader.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/bootloader.mk b/tasks/bootloader.mk
index 3afa27a..3e9d186 100644
--- a/tasks/bootloader.mk
+++ b/tasks/bootloader.mk
@@ -129,10 +129,10 @@ $(1) : $(2) edk2_tools FORCE_BOOTLOADER_REMAKE | $(EDK2_PREVIOUS_ROM)
export WORKSPACE=$$(EDK2_WORKSPACE) && \
export EDK_TOOLS_PATH=$$(EDK2_BASETOOLS) && \
export PATH=`pwd`:$$(dir $$(UEFI_TOOLS_PREFIX)):$$(EDK2_BASETOOLS)/BinWrappers/PosixLike:$$(PATH) && \
- export CROSS_COMPILE=$(notdir $$(UEFI_TOOLS_PREFIX)) && \
+ export CROSS_COMPILE=$$(notdir $$(UEFI_TOOLS_PREFIX)) && \
if [ -e $$(UEFI_TOOLS_PREFIX)ld.bfd ]; then \
echo "Forcing use of GNU linker (as gold doesn't work)"; \
- ln -sf $$(UEFI_TOOLS_PREFIX)ld.bfd $$(notdir $(TARGET_TOOLS_PREFIX))ld; \
+ ln -sf $$(UEFI_TOOLS_PREFIX)ld.bfd $$(notdir $$(UEFI_TOOLS_PREFIX))ld; \
fi && \
export MAKEFLAGS= && \
build -N -a ARM -t ARMLINUXGCC -b $(EDK2_DEB_REL) -D EDK2_OUT_DIR=$(EDK2_OUT_DIR)/$(3) $(4)