aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-07-14 20:50:24 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 21:04:55 -0400
commit50515af207d410c9f228380e529c56f43c3de0bd (patch)
tree93bbbcd3d674439e57bfe655c1b63accb05de4da
parent5a86102248592e178a9023359ccf7f0e489d8e35 (diff)
firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIR
When CONFIG_EXTRA_FIRMWARE_DIR gets changed, the filename in the .S file (which uses .incbin to include the binary) needs to change. When we renamed the BUILTIN_FIRMWARE_DIR option to EXTRA_FIRMWARE_DIR, we forgot to update the manual dependency in firmware/Makefile, so it was depending on a non-existent file in include/config/ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--firmware/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 10028ace2de4..809a52624bda 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -136,7 +136,7 @@ $(patsubst %,$(obj)/%.gen.S, $(fw-shipped-y)): %: $(wordsize_deps) \
136 | $(objtree)/$$(dir %) 136 | $(objtree)/$$(dir %)
137 $(call cmd,fwbin,$(patsubst %.gen.S,%,$@)) 137 $(call cmd,fwbin,$(patsubst %.gen.S,%,$@))
138$(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \ 138$(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \
139 include/config/builtin/firmware/dir.h | $(objtree)/$$(dir %) 139 include/config/extra/firmware/dir.h | $(objtree)/$$(dir %)
140 $(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@)) 140 $(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@))
141 141
142# The .o files depend on the binaries directly; the .S files don't. 142# The .o files depend on the binaries directly; the .S files don't.