From 6dc85707193801ac7640919b160237058ca4d546 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 30 Nov 2015 22:44:53 +0100 Subject: build system: strip quotes from CONFIG_CBFS_PREFIX in a single location Instead of having to remember to strip the quotes everywhere so that string comparisons (of which there are a few) match up, do it right at the beginning. Fixes building the image with a .config where CONFIG_CBFS_PREFIX contains quotes. Change-Id: I4d63341cd9f0bc5e313883ef7b5ca6486190c124 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/12578 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Martin Roth Reviewed-by: Timothy Pearson --- src/arch/arm64/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arch') diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 1cbc9a407d..b1e20dc047 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -168,7 +168,7 @@ $(BL31): .PHONY: $(BL31) -BL31_CBFS := $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/bl31 +BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31 $(BL31_CBFS)-file := $(BL31) $(BL31_CBFS)-type := stage $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG) @@ -177,7 +177,7 @@ cbfs-files-y += $(BL31_CBFS) ifeq ($(CONFIG_ARM64_USE_SECURE_OS),y) SECURE_OS_FILE := $(CONFIG_ARM64_SECURE_OS_FILE) -SECURE_OS_FILE_CBFS := $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/secure_os +SECURE_OS_FILE_CBFS := $(CONFIG_CBFS_PREFIX)/secure_os $(SECURE_OS_FILE_CBFS)-file := $(SECURE_OS_FILE) $(SECURE_OS_FILE_CBFS)-type := stage cbfs-files-y += $(SECURE_OS_FILE_CBFS) -- cgit v1.2.3