Changeset 72d120e in mainline for boot/genarch/src/ofw.c


Ignore:
Timestamp:
2014-06-16T20:17:44Z (11 years ago)
Author:
Agnieszka Tabaka <nufcia@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a78e4e
Parents:
9d653e3 (diff), 334bf28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Integrate from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/genarch/src/ofw.c

    r9d653e3 r72d120e  
    377377            (map->cnt < MEMMAP_MAX_RECORDS); pos += ac + sc) {
    378378                void *start = (void *) (buf[pos + ac - 1]);
    379                 uint32_t size = buf[pos + ac + sc - 1];
     379                uintptr_t size = buf[pos + ac + sc - 1];
    380380               
    381381                /*
Note: See TracChangeset for help on using the changeset viewer.