Changes in boot/arch/sparc64/src/main.c [4872160:339249f] in mainline

File:

• boot/arch/sparc64/src/main.c (modified) (4 diffs)

boot/arch/sparc64/src/main.c

@@ -101 +101 @@
                  * an unknown value of the "compatible" property is encountered.
                  */
-                printf("Warning: Unknown architecture, assuming sun4u.\n");
+                if (str_cmp(compatible, "sun4u") != 0)
+                        printf("Warning: Unknown architecture, assuming sun4u.\n");
                 arch = ARCH_SUN4U;
         } else
@@ -205 +206 @@
         
         void *bootinfo_pa = ofw_translate(&bootinfo);
+        void *kernel_address_pa = ofw_translate((void *) KERNEL_ADDRESS);
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
         
@@ -210 +212 @@
             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);
-        printf(" %p|%p: loader entry pount\n", LOADER_ADDRESS, loader_address_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);
         
         size_t i;
@@ -304 +306 @@
         
         printf("Booting the kernel ...\n");
-        ofw_quiesce();
-        jump_to_kernel((void *) KERNEL_ADDRESS, &bootinfo, subarch,
-            bootinfo.physmem_start | BSP_PROCESSOR);
-}
+        jump_to_kernel(bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, subarch,
+            (void *) KERNEL_ADDRESS);
+}