diff mbox

firmware build: Fix build failure when using CONFIG_EXTRA_FIRMWARE with seperate output dir.

Message ID 20121221180601.3140.75121.stgit@localhost (mailing list archive)
State New, archived
Headers show

Commit Message

Martin Fuzzey Dec. 21, 2012, 6:06 p.m. UTC
When building with a seperate output directory (O=) and
CONFIG_EXTRA_FIRMWARE the build failed with
	firmware/3com/typhoon.bin.gen.S: Assembler messages:
	firmware/3com/typhoon.bin.gen.S:5: Error: file not found: /home/linux_src/firmware/3com/typhoon.bin

Because the generated binary is in the $(objdir) but the generated .S
file tries to reference it in the $(srcdir)

Signed-off-by: Martin Fuzzey <mfuzzey@parkeon.com>
---
 firmware/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/firmware/Makefile b/firmware/Makefile
index eeb1403..a47e499 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -5,7 +5,7 @@ 
 # Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
 # leading /, it's relative to $(srctree).
 fwdir := $(subst ",,$(CONFIG_EXTRA_FIRMWARE_DIR))
-fwabs := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
+fwabs := $(addprefix $(objtree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
 
 fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))