From 57585a7df068138dc96a712ff9adc1f2075cf281 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Tue, 1 Nov 2016 08:37:50 +0000 Subject: [PATCH] Revert "arm64: arm_tf: Do not build raw bl31.bin binary" This reverts commit ba319725dca7784933ebce8dbfe98298acef43c1. Reason for revert: Breaks build for elm-release, oak-release, gru-release and kevin-release. BUG=chromium:661124 TEST=trybot the revert, coreboot builds again on affected targets Change-Id: I2fd96ff0e8406cc94a7a08e5afe859104212c331 Reviewed-on: https://chromium-review.googlesource.com/405130 Reviewed-by: Tomasz Figa Commit-Queue: Tomasz Figa Tested-by: Tomasz Figa Trybot-Ready: Tomasz Figa --- src/arch/arm64/Makefile.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index cf4e45a4a7..6e3f080087 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -139,8 +139,6 @@ $(objcbfs)/ramstage.debug: $$(ramstage-objs) ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y) BL31_SOURCE := $(top)/3rdparty/arm-trusted-firmware -BL31_BUILD := $(abspath $(obj)/3rdparty/arm-trusted-firmware) -BL31_TARGET := $(BL31_BUILD)/bl31/bl31.elf ifeq ($(V),1) BL31_MAKEARGS += V=1 @@ -155,7 +153,7 @@ BL31_MAKEARGS += LOG_LEVEL=0 endif # CONFIG_CONSOLE_SERIAL # Avoid build/release|build/debug distinction by overriding BUILD_PLAT directly -BL31_MAKEARGS += BUILD_PLAT="$(BL31_BUILD)" +BL31_MAKEARGS += BUILD_PLAT="$(abspath $(obj)/3rdparty/arm-trusted-firmware)" # Set a consistent build timestamp: the same coreboot has # The \# \" complications exist to satisfy both gnu make's parser and editors @@ -173,8 +171,8 @@ $(BL31): $(obj)/build.h CROSS_COMPILE="$(CROSS_COMPILE_arm64)" \ CFLAGS="$(BL31_CFLAGS)" \ LDFLAGS="$(BL31_LDFLAGS)" \ - $(MAKE) -C $(BL31_SOURCE) $(BL31_MAKEARGS) $(BL31_TARGET) - mv $(BL31_TARGET) $@ + $(MAKE) -C $(BL31_SOURCE) $(BL31_MAKEARGS) bl31 + mv $(obj)/3rdparty/arm-trusted-firmware/bl31/bl31.elf $@ .PHONY: $(BL31)