|
@@ -601,21 +601,22 @@ roms :
|
601
|
601
|
# This is needed in order to correctly rebuild embedded.o whenever the
|
602
|
602
|
# list of objects changes.
|
603
|
603
|
#
|
|
604
|
+EMBED := $(EMBEDDED_IMAGE) # Maintain backwards compatibility
|
604
|
605
|
EMBEDDED_LIST := $(BIN)/.embedded.list
|
605
|
606
|
ifeq ($(wildcard $(EMBEDDED_LIST)),)
|
606
|
|
-EMBEDDED_IMAGE_OLD := <invalid>
|
|
607
|
+EMBED_OLD := <invalid>
|
607
|
608
|
else
|
608
|
|
-EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST))
|
|
609
|
+EMBED_OLD := $(shell cat $(EMBEDDED_LIST))
|
609
|
610
|
endif
|
610
|
|
-ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE))
|
611
|
|
-$(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST))
|
|
611
|
+ifneq ($(EMBED_OLD),$(EMBED))
|
|
612
|
+$(shell $(ECHO) "$(EMBED)" > $(EMBEDDED_LIST))
|
612
|
613
|
endif
|
613
|
614
|
|
614
|
615
|
$(EMBEDDED_LIST) :
|
615
|
616
|
|
616
|
617
|
VERYCLEANUP += $(EMBEDDED_LIST)
|
617
|
618
|
|
618
|
|
-EMBEDDED_FILES := $(subst $(COMMA), ,$(EMBEDDED_IMAGE))
|
|
619
|
+EMBEDDED_FILES := $(subst $(COMMA), ,$(EMBED))
|
619
|
620
|
EMBED_ALL := $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
|
620
|
621
|
EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
|
621
|
622
|
\"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
|