From cd1fa1a7786212f6527446102d62ab4ca2b3c3cc Mon Sep 17 00:00:00 2001 From: Zeng Zhaoming Date: Thu, 5 May 2011 23:32:17 +0800 Subject: ENGR00143074 Firmware: Fix firmware build failed in 2.6.38 kernel Firmware build failed when add ihex format firmware. This regression introduced by d21b2d2fb3a689193cae637d7195512ba8451a63, which wrongly add 'bin-format' firmware. Fix it by revert the wrong commit and convert sdma firmware to ihex. Signed-off-by: Zeng Zhaoming Acked-by: Lily Zhang --- firmware/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'firmware/Makefile') diff --git a/firmware/Makefile b/firmware/Makefile index 7f67f8eea49..8fc14ff69d9 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -171,12 +171,11 @@ quiet_cmd_fwbin = MK_FW $@ ASM_WORD=$(if $(CONFIG_64BIT),.quad,.long); \ ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \ PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \ - FWPATH=$(if $(KBUILD_SRC),$(srctree)/)$(2); \ echo "/* Generated by firmware/Makefile */" > $@;\ echo " .section .rodata" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ - echo " .incbin \"$${FWPATH}\"" >>$@;\ + echo " .incbin \"$(2)\"" >>$@;\ echo "_fw_end:" >>$@;\ echo " .section .rodata.str,\"aMS\",$${PROGBITS},1" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ -- cgit v1.2.3