diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.inc | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -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 6325a448bd..3ead1de45d 100644 --- 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 \ |