Changeset bbe7848 in mainline for boot/arch/ppc32/src/main.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

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

boot/arch/ppc32/src/main.c

@@ -68 +68 @@
         printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa);
         printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, loader_address_pa);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     ofw_translate(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);