Changeset eb522e8 in mainline for boot/arch/mips32/src/main.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• boot/arch/mips32/src/main.c (modified) (2 diffs)

boot/arch/mips32/src/main.c

@@ -51 +51 @@
         
         printf("\nMemory statistics\n");
-        printf(" %p|%p: CPU map\n", PA2KA(CPUMAP_OFFSET), CPUMAP_OFFSET);
-        printf(" %p|%p: bootstrap stack\n", PA2KA(STACK_OFFSET), STACK_OFFSET);
-        printf(" %p|%p: boot info structure\n", PA2KA(BOOTINFO_OFFSET), BOOTINFO_OFFSET);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
-        printf(" %p|%p: bootloader entry point\n", PA2KA(LOADER_OFFSET), LOADER_OFFSET);
+        printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET),
+            (void *) CPUMAP_OFFSET);
+        printf(" %p|%p: bootstrap stack\n", (void *) PA2KA(STACK_OFFSET),
+            (void *) STACK_OFFSET);
+        printf(" %p|%p: boot info structure\n",
+            (void *) PA2KA(BOOTINFO_OFFSET), (void *) BOOTINFO_OFFSET);
+        printf(" %p|%p: kernel entry point\n", (void *) PA2KA(BOOT_OFFSET),
+            (void *) BOOT_OFFSET);
+        printf(" %p|%p: bootloader entry point\n",
+            (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
-                    KSEG2PA(components[i].start), components[i].name,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
+                    (void *) KSEG2PA(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);
         
@@ -91 +96 @@
                 if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
                         printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
-                            components[i].name, tail, PA2KA(LOADER_OFFSET));
+                            components[i].name, tail, (void *) PA2KA(LOADER_OFFSET));
                         halt();
                 }