From 77213330a3e3a5b849b8b8885525ea8c9fd81618 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 8 Aug 2016 15:12:11 -0600 Subject: [PATCH] UPSTREAM: Makefile.inc: Strip CONFIG_DEVICETREE quotes at top of makefile Minor change - Instead of stripping the quotes from CONFIG_DEVICETREE inline, add it to the location where we normalize all the other Kconfig variables. BUG=None BRANCH=None TEST=None Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/16116 Reviewed-by: Patrick Georgi Change-Id: Idbc58179c7b45160afef7d7e44f9b3b334f8c4a7 Reviewed-on: https://chromium-review.googlesource.com/368949 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 956ed52d92..63f9b0e159 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -19,6 +19,7 @@ GIT:=$(shell [ -e "$(top)/.git" ] && command -v git) # normalize Kconfig variables in a central place CONFIG_CBFS_PREFIX:=$(call strip_quotes,$(CONFIG_CBFS_PREFIX)) CONFIG_FMDFILE:=$(call strip_quotes,$(CONFIG_FMDFILE)) +CONFIG_DEVICETREE:=$(call strip_quotes, $(CONFIG_DEVICETREE)) ####################################################################### # misleadingly named, this is the coreboot version @@ -451,7 +452,7 @@ $(obj)/config.h: $(objutil)/kconfig/conf ####################################################################### # needed objects that every mainboard uses # Creation of these is architecture and mainboard independent -DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(call strip_quotes, $(CONFIG_DEVICETREE)) +DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(CONFIG_DEVICETREE) DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig