Changes in kernel/arch/sparc64/src/sun4u/start.S [f238e86:4872160] in mainline

File:

• kernel/arch/sparc64/src/sun4u/start.S (modified) (3 diffs)

kernel/arch/sparc64/src/sun4u/start.S

@@ -60 +60 @@
 /*
  * Here is where the kernel is passed control from the boot loader.
- * 
+ *
  * The registers are expected to be in this state:
- * - %o0 starting address of physical memory + bootstrap processor flag
- *      bits 63...1:    physical memory starting address / 2
- *      bit 0:          non-zero on BSP processor, zero on AP processors
- * - %o1 bootinfo structure address (BSP only)
- * - %o2 bootinfo structure size (BSP only)
+ *  - %o0 bootinfo structure address (BSP only)
+ *  - %o1 starting address of physical memory
+ *        + bootstrap processor flag
+ *          bits 63...1: physical memory starting address / 2
+ *          bit 0:       non-zero on BSP processor, zero on AP processors
  *
  * Moreover, we depend on boot having established the following environment:
- * - TLBs are on
- * - identity mapping for the kernel image
+ *  - TLBs are on
+ *  - identity mapping for the kernel image
+ *
  */
 
@@ -76 +77 @@
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
-        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
+        and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o1, %l0, %l6                      ! l6 <= start of physical memory
 
         ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
@@ -282 +283 @@
         sub %sp, STACK_BIAS, %sp
 
-        sethi %hi(bootinfo), %o0
-        call memcpy                             ! copy bootinfo
-        or %o0, %lo(bootinfo), %o0
-
         call arch_pre_main
         nop