Changeset b97b348 in mainline for boot/arch/sparc64/src/main.c

Timestamp:

2010-05-12T20:00:19Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

be6cef1b

Parents:

f09d891

Message:

do not use ofw_quiesce() (it can actually make more harm than good)
fix the order of arguments passed from the bootloader to kernel on sparc64 (this fixes booting on machines with non-zero physical address start)
remove separate cache.S, use the code directly in start.S

File:

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

boot/arch/sparc64/src/main.c

@@ -205 +205 @@
         
         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 +211 @@
             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: kernel entry point\n", KERNEL_ADDRESS, kernel_address_pa);
         printf(" %p|%p: loader entry pount\n", LOADER_ADDRESS, loader_address_pa);
         
@@ -304 +305 @@
         
         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);
+}