[coreboot] [commit] r5226 - in trunk: . src/arch/i386
repository service
svn at coreboot.org
Tue Mar 16 20:01:33 CET 2010
Author: oxygene
Date: Tue Mar 16 20:01:32 2010
New Revision: 5226
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5226
Log:
Strip quotes from COREBOOT_ROM_DEPENDENCIES
Macro-ify stripping quotes
Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi at coresystems.de>
Modified:
trunk/Makefile
trunk/src/arch/i386/Makefile.inc
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Tue Mar 16 17:59:03 2010 (r5225)
+++ trunk/Makefile Tue Mar 16 20:01:32 2010 (r5226)
@@ -85,10 +85,12 @@
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-$(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
Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc Tue Mar 16 17:59:03 2010 (r5225)
+++ trunk/src/arch/i386/Makefile.inc Tue Mar 16 20:01:32 2010 (r5226)
@@ -24,7 +24,8 @@
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 \
More information about the coreboot
mailing list