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

Changeset 84439d7 in mainline for boot/arch/sparc64/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/sparc64/src/main.c

    r56b962d r84439d7  
    209209        void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
    210210       
    211         printf("\nMemory statistics (total %llu MB, starting at %p)\n",
    212             bootinfo.memmap.total >> 20, bootinfo.physmem_start);
    213         printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
    214         printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, kernel_address_pa);
    215         printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
     211        printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n",
     212            bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
     213        printf(" %p|%p: boot info structure\n", &bootinfo, (void *) bootinfo_pa);
     214        printf(" %p|%p: kernel entry point\n",
     215            (void *) KERNEL_ADDRESS, (void *) kernel_address_pa);
     216        printf(" %p|%p: loader entry point\n",
     217            (void *) LOADER_ADDRESS, (void *) loader_address_pa);
    216218       
    217219        size_t i;
    218220        for (i = 0; i < COMPONENTS; i++)
    219                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
     221                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
    220222                    ofw_translate(components[i].start), components[i].name,
    221223                    components[i].inflated, components[i].size);
Note: See TracChangeset for help on using the changeset viewer.