Changeset bd48f4c in mainline for boot/arch


Ignore:
Timestamp:
2010-07-12T10:53:30Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (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.

Location:
boot/arch
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/abs32le/Makefile.inc

    rc40e6ef rbd48f4c  
    11#
    2 # Copyright (c) 2001-2004 Jakub Jermar
     2# Copyright (c) 2010 Martin Decky
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 .text
    30 .global panic_printf
    31 
    32 panic_printf:
    33         movl $halt, (%esp)      # fake stack to make printf return to halt
    34         jmp printf
     29BOOT_OUTPUT =
     30RAW =
     31JOB =
     32MAP =
     33PREBUILD =
     34BUILD = Makefile.empty

  • boot/arch/ia64/src/asm.S

    rc40e6ef rbd48f4c  
    113113jump_to_kernel:
    114114        alloc loc0 = ar.pfs, 1, 1, 0, 0
    115         mov r1 = in0 ;;                 # Pass bootinfo address
     115        mov r2 = in0 ;;                 # Pass bootinfo address
    116116        movl r8 = KERNEL_ADDRESS;;
    117117        mov b1 = r8 ;;
Note: See TracChangeset for help on using the changeset viewer.