Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/mips32/src/main.c

    r56b962d r84439d7  
    5151       
    5252        printf("\nMemory statistics\n");
    53         printf(" %p|%p: CPU map\n", PA2KA(CPUMAP_OFFSET), CPUMAP_OFFSET);
    54         printf(" %p|%p: bootstrap stack\n", PA2KA(STACK_OFFSET), STACK_OFFSET);
    55         printf(" %p|%p: boot info structure\n", PA2KA(BOOTINFO_OFFSET), BOOTINFO_OFFSET);
    56         printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
    57         printf(" %p|%p: bootloader entry point\n", PA2KA(LOADER_OFFSET), LOADER_OFFSET);
     53        printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET),
     54            (void *) CPUMAP_OFFSET);
     55        printf(" %p|%p: bootstrap stack\n", (void *) PA2KA(STACK_OFFSET),
     56            (void *) STACK_OFFSET);
     57        printf(" %p|%p: boot info structure\n",
     58            (void *) PA2KA(BOOTINFO_OFFSET), (void *) BOOTINFO_OFFSET);
     59        printf(" %p|%p: kernel entry point\n", (void *) PA2KA(BOOT_OFFSET),
     60            (void *) BOOT_OFFSET);
     61        printf(" %p|%p: bootloader entry point\n",
     62            (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET);
    5863       
    5964        size_t i;
    6065        for (i = 0; i < COMPONENTS; i++)
    61                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
    62                     KSEG2PA(components[i].start), components[i].name,
     66                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
     67                    (void *) KSEG2PA(components[i].start), components[i].name,
    6368                    components[i].inflated, components[i].size);
    6469       
     
    9196                if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
    9297                        printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
    93                             components[i].name, tail, PA2KA(LOADER_OFFSET));
     98                            components[i].name, tail, (void *) PA2KA(LOADER_OFFSET));
    9499                        halt();
    95100                }
Note: See TracChangeset for help on using the changeset viewer.