diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-04 16:44:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-04 16:44:11 +1000 |
| commit | f0c5123415078e99c9b37d73afb9221dafcecd1d (patch) | |
| tree | 02d0faea09fae35599342128b95decbb840d5f7e | |
| parent | 8573b31ef7c128d540565a7b2b60c932e8f7be91 (diff) | |
firmware: build fixes 1
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | drivers/net/usb/kaweth.c | 2 | ||||
| -rw-r--r-- | firmware/Makefile | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 156b61caa5ee..9b1da4bb8083 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -419,9 +419,11 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth, dbg("High: %i, Low:%i", kaweth->firmware_buf[3], kaweth->firmware_buf[2]); +#if 0 dbg("Downloading firmware at %p to kaweth device at %p", data, kaweth); +#endif dbg("Firmware length: %d", data_len); return kaweth_control(kaweth, diff --git a/firmware/Makefile b/firmware/Makefile index 1d842372b694..d1e46756ba0d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -61,16 +61,16 @@ quiet_cmd_fwbin = MK_FW $@ ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \ echo "/* Generated by firmware/Makefile */" > $@;\ echo " .section .rodata" >>$@;\ - echo " .align $(ASM_ALIGN)" >>$@;\ + echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ echo " .incbin \"$(2)\"" >>$@;\ echo "_fw_end:" >>$@;\ echo " .section .rodata.str,\"aMS\",@progbits,1" >>$@;\ - echo " .align $${ASM_ALIGN}" >>$@;\ + echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_name:" >>$@;\ echo " .string \"$$FWNAME\"" >>$@;\ echo " .section .builtin_fw,\"a\",@progbits" >>$@;\ - echo " .align $${ASM_ALIGN}" >>$@;\ + echo " .p2align $${ASM_ALIGN}" >>$@;\ echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\ echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\ echo " $${ASM_WORD} _fw_end - _fw_$${FWSTR}_bin" >>$@; |