Changes in boot/arch/riscv64/src/main.c [ae8d7b0:a35b458] in mainline

File:

• boot/arch/riscv64/src/main.c (modified) (6 diffs)

boot/arch/riscv64/src/main.c

@@ -48 +48 @@
 {
         version_print();
-        
+
         bootinfo.htif_frame = ((uintptr_t) &htif_page) >> PAGE_WIDTH;
         bootinfo.pt_frame = ((uintptr_t) &pt_page) >> PAGE_WIDTH;
-        
+
         bootinfo.ucbinfo.tohost =
             (volatile uint64_t *) PA2KA((uintptr_t) &tohost);
         bootinfo.ucbinfo.fromhost =
             (volatile uint64_t *) PA2KA((uintptr_t) &fromhost);
-        
+
         // FIXME TODO: read from device tree
         bootinfo.physmem_start = PHYSMEM_START;
@@ -63 +63 @@
         bootinfo.memmap.zones[0].start = (void *) PHYSMEM_START;
         bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
-        
+
         printf("\nMemory statistics (total %lu MB, starting at %p)\n\n",
             bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
         printf(" %p: boot info structure\n", &bootinfo);
-        
+
         uintptr_t top = BOOT_OFFSET;
-        
+
         for (size_t i = 0; i < COMPONENTS; i++) {
                 printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr,
                     components[i].name, components[i].inflated,
                     components[i].size);
-                
+
                 uintptr_t tail = (uintptr_t) components[i].addr +
                     components[i].size;
@@ -83 +83 @@
                 }
         }
-        
+
         printf(" %p: inflate area\n", (void *) top);
-        
+
         void *kernel_entry = NULL;
         void *dest[COMPONENTS];
         size_t cnt = 0;
         bootinfo.taskmap.cnt = 0;
-        
+
         for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -99 +99 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 } else
                         kernel_entry = (void *) PA2KA(top);
-                
+
                 dest[i] = (void *) top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf(" %p: kernel entry point\n", kernel_entry);
-        
+
         if (top >= bootinfo.physmem_start + bootinfo.memmap.total) {
                 printf("Not enough physical memory available.\n");
@@ -119 +119 @@
                 halt();
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (size_t i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -134 +134 @@
                 }
         }
-        
+
         printf(".\n");
-        
+
         printf("Booting the kernel...\n");
         jump_to_kernel(PA2KA(&bootinfo));