firmware: fix build of external firmware

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It looks like commit 5180d5f483 ("firmware: Simplify directory
creation") uncovered a latent bug: The cmd_fwbin make macro, which is
being called without any arguments, referenced argument 2, which I
suppose previously just happened to be set to the right value (from an
enclosing macro invocation - some make versions don't always properly
clear unused macro arguments on nested macro invocations). In 3.16 with
such make versions it now points into the source tree instead,
resulting in build failure when building outside the source tree. And
obviously on make versions properly clearing unused arguments it would
have resolved to empty.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -159,7 +159,7 @@ quiet_cmd_fwbin = MK_FW   $@
 		  echo "    .section .rodata"				>>$@;\
 		  echo "    .p2align $${ASM_ALIGN}"			>>$@;\
 		  echo "_fw_$${FWSTR}_bin:"				>>$@;\
-		  echo "    .incbin \"$(2)\""				>>$@;\
+		  echo "    .incbin \"$(obj)/$$FWNAME\""		>>$@;\
 		  echo "_fw_end:"					>>$@;\
 		  echo "   .section .rodata.str,\"aMS\",$${PROGBITS},1"	>>$@;\
 		  echo "    .p2align $${ASM_ALIGN}"			>>$@;\



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




[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux