Changeset 5387807 in mainline for boot/arch

Timestamp:

2010-06-17T20:58:50Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8ef40329

Parents:

d0c82c5 (diff), 3193c05 (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 progress from the ia64-revival branch.

Location:

boot/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• src/asm.S (modified) (2 diffs)
• src/boot.S (modified) (1 diff)

boot/arch/ia64/Makefile.inc

@@ -38 +38 @@
 RD_SRVS_NON_ESSENTIAL +=
 
-RD_SRVS_ESSENTIAL +=
+RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hw/char/i8042/i8042
 
 SOURCES = \

boot/arch/ia64/src/asm.S

@@ -97 +97 @@
         adds r15 = -1, r15
         add r17 = r14, in1 
-(p6)    br.cond.dpnt 2b ;;
+(p6)    br.cond.dpnt 2b ;;
         mov ar.lc = r15
 6:
@@ -112 +112 @@
 
 jump_to_kernel:
-    alloc loc0 = ar.pfs, 1, 1, 0, 0
-    mov r1 = in0;                       # Pass bootinfo address
-    movl r8 = KERNEL_ADDRESS;;
-    mov b1 = r8 ;;
-    br.call.sptk.many b0 = b1;;
+        alloc loc0 = ar.pfs, 1, 1, 0, 0
+        mov r1 = in0 ;;                 # Pass bootinfo address
+        movl r8 = KERNEL_ADDRESS;;
+        mov b1 = r8 ;;
+        br.call.sptk.many b0 = b1;;

boot/arch/ia64/src/boot.S

@@ -51 +51 @@
         add r12 = -16, r12
 
-        ssm (1 << 19) ;;        /* disable f32 - f127 */
+        #
+        # Disable Floating-point High register set (f32 - f127)
+        #
+        ssm (1 << 19) ;;
         srlz.i
         srlz.d ;;
 
-        movl r18 = bootstrap ;;
-        mov b1 = r18 ;;
-        br.call.sptk.many b0 = b1
+        br.call.sptk.many rp = bootstrap
 
 .bss