Changeset ab3a851 in mainline for boot/arch

Timestamp:

2010-11-30T00:50:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1b2981aa

Parents:

178673c (diff), 41a7f62 (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: fixed printf related warnings

Location:

boot/arch

Files:

• arm32/src/main.c (modified) (1 diff)
• ia64/src/main.c (modified) (1 diff)
• mips32/include/arch.h (modified) (1 diff)
• mips32/src/main.c (modified) (2 diffs)
• ppc32/src/main.c (modified) (1 diff)
• sparc64/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;

boot/arch/ia64/src/main.c

@@ -62 +62 @@
         
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, KERNEL_ADDRESS);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, LOADER_ADDRESS);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) KERNEL_ADDRESS);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
         
         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,
                     components[i].start, components[i].name,
                     components[i].inflated, components[i].size);

boot/arch/mips32/include/arch.h

@@ -40 +40 @@
 
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
-#define MSIM_DORDER_ADDRESS    0xb0000004
+#define MSIM_DORDER_ADDRESS    0xb0000100
 
 #ifndef __ASM__

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();
                 }

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);

boot/arch/sparc64/src/main.c

@@ -209 +209 @@
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
         
-        printf("\nMemory statistics (total %llu MB, starting at %p)\n",
-            bootinfo.memmap.total >> 20, bootinfo.physmem_start);
-        printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, kernel_address_pa);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
+        printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n",
+            bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
+        printf(" %p|%p: boot info structure\n", &bootinfo, (void *) bootinfo_pa);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) kernel_address_pa);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) 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);