From: David Woodhouse Date: Tue, 15 Jul 2008 00:50:24 +0000 (-0700) Subject: firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIR X-Git-Tag: v2.6.27-rc1~1093 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=50515af207d410c9f228380e529c56f43c3de0bd;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Linus Torvalds --- diff --git a/firmware/Makefile b/firmware/Makefile index 10028ace2de..809a52624bd 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -136,7 +136,7 @@ $(patsubst %,$(obj)/%.gen.S, $(fw-shipped-y)): %: $(wordsize_deps) \ | $(objtree)/$$(dir %) $(call cmd,fwbin,$(patsubst %.gen.S,%,$@)) $(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \ - include/config/builtin/firmware/dir.h | $(objtree)/$$(dir %) + include/config/extra/firmware/dir.h | $(objtree)/$$(dir %) $(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@)) # The .o files depend on the binaries directly; the .S files don't.