Changeset 04803bf in mainline for boot/arch/ia64/src/asm.S

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

• boot/arch/ia64/src/asm.S (moved) (moved from boot/arch/ia64/loader/asm.S ) (2 diffs)

boot/arch/ia64/src/asm.S

@@ -1 +1 @@
 #
 # Copyright (c) 2006 Martin Decky
-# Copyright (c) 2006 Jakub Jermar 
+# Copyright (c) 2006 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +28 @@
 #
 
-#include <stack.h>
+#include <arch/arch.h>
 
 .text
 
+.global halt
+.global memcpy
 .global jump_to_kernel
 
+halt:
+        br halt
+
 jump_to_kernel:
-    alloc loc0 = ar.pfs, 1, 1, 0, 0
-    movl r8 = 0x4404000;;
-    mov b1 = r8 ;;
-    mov r1 = in0;               #Save bootinfo prt
-    br.call.sptk.many b0 = b1;;
+        alloc loc0 = ar.pfs, 1, 1, 0, 0
+        mov r2 = in0 ;;                 # Pass bootinfo address
+        movl r8 = KERNEL_ADDRESS;;
+        mov b1 = r8 ;;
+        br.call.sptk.many b0 = b1;;