diff options
| author | Zeng Zhaoming <b32542@freescale.com> | 2011-05-05 23:32:17 +0800 |
|---|---|---|
| committer | Zeng Zhaoming <b32542@freescale.com> | 2011-05-05 23:32:17 +0800 |
| commit | cd1fa1a7786212f6527446102d62ab4ca2b3c3cc (patch) | |
| tree | 26d3da83cf6c8b4c941d8acdaec826aae8fae9cb /firmware/Makefile | |
| parent | 3002afc5b80bd4bfe425bc62ca7bed192d0c2547 (diff) | |
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 <b32542@freescale.com>
Acked-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
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}" >>$@;\ |