Changeset b5e68c8 in mainline for boot/arch/arm32/src/main.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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:

• boot/arch/arm32/src/main.c (modified) (1 diff)

boot/arch/arm32/src/main.c

@@ -61 +61 @@
         printf(" %p|%p: bootstrap page table\n", &boot_pt, &boot_pt);
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
         
         size_t i;