Changeset 7a9364c in mainline for kernel/arch


Ignore:
Timestamp:
2007-09-13T12:50:16Z (18 years ago)
Author:
Jakub Vana <jakub.vana@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c952465d
Parents:
0f78e74
Message:

Pack ski version of HelenOS to image.boot loader

Location:
kernel/arch/ia64
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/Makefile.inc

    r0f78e74 r7a9364c  
    8888        ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c
    8989        DEFS += -DSKI
    90         BFD = elf64-ia64-little
     90#       BFD = elf64-ia64-little
     91        BFD = binary
    9192endif
    9293

  • kernel/arch/ia64/src/ia64.c

    r0f78e74 r7a9364c  
    6262        /* Setup usermode init tasks. */
    6363
    64 #ifdef I460GX
     64//#ifdef I460GX
    6565        int i;
    6666        init.cnt = bootinfo->taskmap.count;
    … …  
    7070            init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
    7171        }
     72/*
    7273#else   
    7374        init.cnt = 8;
    … …  
    8889        init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000;
    8990        init.tasks[7].size = INIT0_SIZE;
    90 #endif
     91#endif*/
    9192}
    9293

  • kernel/arch/ia64/src/start.S

    r0f78e74 r7a9364c  
    108108
    109109        # initialize gp (Global Pointer) register
    110         mov r20 = r1 ;;
     110        movl r20 = (VRN_KERNEL << VRN_SHIFT);;
     111        or r20 = r20,r1;;
    111112        movl r1 = _hardcoded_load_address
    112 
     113       
    113114        /*
    114115         * Initialize hardcoded_* variables.
Note: See TracChangeset for help on using the changeset viewer.