Changeset 8e7c9fe in mainline for boot/genarch/src/ofw.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• boot/genarch/src/ofw.c (modified) (1 diff)

boot/genarch/src/ofw.c

@@ -377 +377 @@
             (map->cnt < MEMMAP_MAX_RECORDS); pos += ac + sc) {
                 void *start = (void *) (buf[pos + ac - 1]);
-                uint32_t size = buf[pos + ac + sc - 1];
+                uintptr_t size = buf[pos + ac + sc - 1];
                 
                 /*