Changeset 7a9364c in mainline for boot/arch/ia64


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:
boot/arch/ia64
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/Makefile.inc

    r0f78e74 r7a9364c  
    2727#
    2828
    29 ifeq ($(MACHINE),ski)
     29#ifeq ($(MACHINE),ski)
    3030
    3131
    3232
    33 VMAXLMA_SRC = tools/ia64/vmaxlma.c
    34 build: $(BASE)/kernel.bin
    35 echo Building SKI
     33#VMAXLMA_SRC = tools/ia64/vmaxlma.c
     34#build: $(BASE)/kernel.bin
     35#echo Building SKI
    3636#$(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma
    3737#       cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin
    … …  
    4343
    4444
    45 else
     45#else
    4646
    4747
    … …  
    6262
    6363
    64 endif
     64#endif

  • boot/arch/ia64/loader/Makefile

    r0f78e74 r7a9364c  
    8080COMPONENTS = \
    8181        $(KERNELDIR)/kernel.bin \
    82        
    83 #       $(USPACEDIR)/srv/ns/ns \
    84 #       $(USPACEDIR)/srv/fb/fb \
    85 #       $(USPACEDIR)/srv/kbd/kbd \
    86 #       $(USPACEDIR)/srv/console/console \
    87 #       $(USPACEDIR)/app/init/init \
    88 #       $(USPACEDIR)/app/tetris/tetris \
    89 #       $(USPACEDIR)/app/tester/tester \
    90 #       $(USPACEDIR)/app/klog/klog
     82        $(USPACEDIR)/srv/ns/ns \
     83        $(USPACEDIR)/srv/fb/fb \
     84        $(USPACEDIR)/srv/kbd/kbd \
     85        $(USPACEDIR)/srv/console/console \
     86        $(USPACEDIR)/app/init/init \
     87        $(USPACEDIR)/app/tetris/tetris \
     88        $(USPACEDIR)/app/tester/tester \
     89        $(USPACEDIR)/app/klog/klog
     90
    9191
    9292OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

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

    r0f78e74 r7a9364c  
    3232.text
    3333
    34 .global halt
    35 .global memcpy
    3634.global jump_to_kernel
    37 
    38 halt:
    39        
    40 memcpy:
    4135
    4236jump_to_kernel:

  • boot/arch/ia64/loader/boot.S

    r0f78e74 r7a9364c  
    3737        mov ar.rsc = r0
    3838#       movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
    39         movl r1 = 0x100000
     39        movl r1 = 0x4400000
    4040        movl r8 = initial_stack ;;
    4141        mov ar.bspstore = r8
Note: See TracChangeset for help on using the changeset viewer.