Strip quotes from COREBOOT_ROM_DEPENDENCIES

Macro-ify stripping quotes

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5226 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index acf6408a23987de607d43217501076c02f57bd24..3aa48f861ef32a7b833805c4332b6e352e561155 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,10 +85,12 @@ HOSTCC:=clang
 endif
 endif
 
+strip_quotes = $(subst ",,$(subst \",,$(1)))
+
 ARCHDIR-$(CONFIG_ARCH_X86)    := i386
 ARCHDIR-$(CONFIG_ARCH_POWERPC) := ppc
 
-MAINBOARDDIR=$(subst ",,$(CONFIG_MAINBOARD_DIR))
+MAINBOARDDIR=$(call strip_quotes,$(CONFIG_MAINBOARD_DIR))
 export MAINBOARDDIR
 
 PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
@@ -99,7 +101,7 @@ BUILD-y += util/cbfstool
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
 ifneq ($(CONFIG_LOCALVERSION),"")
-COREBOOT_EXTRA_VERSION := -$(subst ",,$(CONFIG_LOCALVERSION))
+COREBOOT_EXTRA_VERSION := -$(call strip_quotes,$(CONFIG_LOCALVERSION))
 endif
 
 # The primary target needs to be here before we include the

diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 6325a448bd0d43babf2ddeffc1f8bb701c3f5346..3ead1de45d192fe673a82b52c30d7e7e4a59fca0 100644 (file)
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -24,7 +24,8 @@ endif
 ifeq ($(CONFIG_BOOTSPLASH),y)
 COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_FALLBACK_BOOTSPLASH_FILE)
 endif
-$(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(COREBOOT_ROM_DEPENDENCIES)
+strip_quotes = $(subst ",,$(subst \",,$(1)))
+$(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES))
        cp $(obj)/coreboot.pre $@.tmp
        if [ -f fallback/coreboot_apc ]; \
        then \