Changeset 15d0046 in mainline for boot/genarch/src/ofw.c


Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/genarch/src/ofw.c

    r8db09e4 r15d0046  
    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.