firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIR
David Woodhouse [Tue, 15 Jul 2008 00:50:24 +0000 (17:50 -0700)]
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>

firmware/Makefile

index 10028ac..809a526 100644 (file)
@@ -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.