From 745bf1a9db85b4d8b1a9776da342c94600848489 Mon Sep 17 00:00:00 2001
From: lilvinz <lilvinz@nscit.com>
Date: Wed, 19 Jun 2013 17:54:37 +0200
Subject: [PATCH] firmware_defs.mk: add support for build paths containing @

---
 make/firmware-defs.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk
index e0c5f6cc3..1b28ecf8f 100644
--- a/make/firmware-defs.mk
+++ b/make/firmware-defs.mk
@@ -95,14 +95,15 @@ gccversion:
 	@$(ECHO) $(MSG_LOAD_FILE) $(call toprel, $@)
 	$(V1) $(OBJCOPY) -O binary $< $@
 
+replace_special_chars = $(subst @,_,$(subst :,_,$(subst -,_,$(subst .,_,$(subst /,_,$1)))))
 %.bin.o: %.bin
 	@$(ECHO) $(MSG_BIN_OBJ) $(call toprel, $@)
 	$(V1) $(OBJCOPY) -I binary -O elf32-littlearm --binary-architecture arm \
 		--rename-section .data=.rodata,alloc,load,readonly,data,contents \
 		--wildcard \
-		--redefine-sym _binary_$(subst :,_,$(subst -,_,$(subst .,_,$(subst /,_,$<))))_start=_binary_start \
-		--redefine-sym _binary_$(subst :,_,$(subst -,_,$(subst .,_,$(subst /,_,$<))))_end=_binary_end \
-		--redefine-sym _binary_$(subst :,_,$(subst -,_,$(subst .,_,$(subst /,_,$<))))_size=_binary_size \
+		--redefine-sym _binary_$(call replace_special_chars,$<)_start=_binary_start \
+		--redefine-sym _binary_$(call replace_special_chars,$<)_end=_binary_end \
+		--redefine-sym _binary_$(call replace_special_chars,$<)_size=_binary_size \
 		$< $@
 
 # Create extended listing file/disassambly from ELF output file.