diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-05 17:17:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-05 17:17:56 +1000 |
| commit | e99b5dc320af8c10af9a35a827176365db6648c9 (patch) | |
| tree | 42d1d6a20aa3d66efd25307887c6670f3a0f7211 | |
| parent | 13105e93d0554e1eb4cb7cbdebb6530c69acd69a (diff) | |
firmware: build fixes 2
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | firmware/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 94bd5b7690a7..b8df924133a0 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -59,20 +59,21 @@ quiet_cmd_fwbin = MK_FW $@ firmware/%.gen.S,%,$@))))"; \ ASM_WORD=$(if $(CONFIG_64BIT),.quad,.long); \ ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \ + AT_SYM=$(if $(CONFIG_ARM),%,@); \ echo "/* Generated by firmware/Makefile */" > $@;\ echo " .section .rodata" >>$@;\ - echo " .p2align $(ASM_ALIGN)" >>$@;\ + echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ echo " .incbin \"$(2)\"" >>$@;\ echo "_fw_end:" >>$@;\ - echo " .section .rodata.str,\"aMS\",@progbits,1" >>$@;\ + echo " .section .rodata.str,\"aMS\",$${AT_SYM}progbits,1" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_name:" >>$@;\ - echo " .string \"$$FWNAME\"" >>$@;\ - echo " .section .builtin_fw,\"a\",@progbits" >>$@;\ + echo " .string \"$${FWNAME}\"" >>$@;\ + echo " .section .builtin_fw,\"a\",$${AT_SYM}progbits" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ - echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\ - echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\ + echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\ + echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\ echo " $${ASM_WORD} _fw_end - _fw_$${FWSTR}_bin" >>$@; # One of these files will change, or come into existence, whenever |