Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2518 → Rev 2519

/trunk/boot/arch/ia64/Makefile.inc
26,13 → 26,13
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
ifeq ($(MACHINE),ski)
#ifeq ($(MACHINE),ski)
 
 
 
VMAXLMA_SRC = tools/ia64/vmaxlma.c
build: $(BASE)/kernel.bin
echo Building SKI
#VMAXLMA_SRC = tools/ia64/vmaxlma.c
#build: $(BASE)/kernel.bin
#echo Building SKI
#$(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma
# cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin
# ./vmaxlma $(BASE)/kernel.bin
42,7 → 42,7
# -rm -f $(BASE)/kernel.bin vmaxlma
 
 
else
#else
 
 
build: $(BASE)/image.boot
61,4 → 61,4
-rm -f $(BASE)/image.boot
 
 
endif
#endif
/trunk/boot/arch/ia64/loader/asm.S
31,14 → 31,8
 
.text
 
.global halt
.global memcpy
.global jump_to_kernel
 
halt:
memcpy:
 
jump_to_kernel:
alloc loc0 = ar.pfs, 1, 1, 0, 0
movl r8 = 0x4404000;;
/trunk/boot/arch/ia64/loader/boot.S
36,7 → 36,7
 
mov ar.rsc = r0
# movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
movl r1 = 0x100000
movl r1 = 0x4400000
movl r8 = initial_stack ;;
mov ar.bspstore = r8
loadrs
/trunk/boot/arch/ia64/loader/Makefile
79,16 → 79,16
 
COMPONENTS = \
$(KERNELDIR)/kernel.bin \
# $(USPACEDIR)/srv/ns/ns \
# $(USPACEDIR)/srv/fb/fb \
# $(USPACEDIR)/srv/kbd/kbd \
# $(USPACEDIR)/srv/console/console \
# $(USPACEDIR)/app/init/init \
# $(USPACEDIR)/app/tetris/tetris \
# $(USPACEDIR)/app/tester/tester \
# $(USPACEDIR)/app/klog/klog
$(USPACEDIR)/srv/ns/ns \
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/app/init/init \
$(USPACEDIR)/app/tetris/tetris \
$(USPACEDIR)/app/tester/tester \
$(USPACEDIR)/app/klog/klog
 
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))