Re: linux-next: firmware build failure

[David Woodhouse <dwmw2@infradead.org>]

On Fri, 2008-06-06 at 17:47 +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
>   IHEX2FW firmware/atmsar11.fw
> Bad EOF record (type 01) format
> make[2]: *** [firmware/atmsar11.fw] Error 1

Bah. The actual fix is something like this, which I forgot to commit.
Sorry again -- it's there now (with some more minor cleanups).

--- a/firmware/ihex2fw.c
+++ b/firmware/ihex2fw.c
@@ -146,7 +146,6 @@ next_record:
 
        record->addr  = hex(data + i, &crc) << 8; i += 2;
        record->addr |= hex(data + i, &crc); i += 2;
-       record->addr += offset;
        type = hex(data + i, &crc); i += 2;
 
        for (j = 0; j < record->len; j++, i += 2)
@@ -166,12 +165,13 @@ next_record:
                if (!record->len)
                        break;
 
+               record->addr += offset;
                file_record(record);
                goto next_record;
 
        case 1: /* End-Of-File Record */
                if (record->addr || record->len) {
                        fprintf(stderr, "Bad EOF record (type 01) format\n");


> 
-- 
dwmw2