Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ boot/arch/ia64/Makefile.inc	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -27,11 +27,11 @@
 #
 
-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
@@ -43,5 +43,5 @@
 
 
-else
+#else
 
 
@@ -62,3 +62,3 @@
 
 
-endif
+#endif
Index: boot/arch/ia64/loader/Makefile
===================================================================
--- boot/arch/ia64/loader/Makefile	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ boot/arch/ia64/loader/Makefile	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -80,13 +80,13 @@
 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)))
Index: boot/arch/ia64/loader/asm.S
===================================================================
--- boot/arch/ia64/loader/asm.S	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ boot/arch/ia64/loader/asm.S	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -32,11 +32,5 @@
 .text
 
-.global halt
-.global memcpy
 .global jump_to_kernel
-
-halt:
-	
-memcpy:
 
 jump_to_kernel:
Index: boot/arch/ia64/loader/boot.S
===================================================================
--- boot/arch/ia64/loader/boot.S	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ boot/arch/ia64/loader/boot.S	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -37,5 +37,5 @@
 	mov ar.rsc = r0
 #	movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
-	movl r1 = 0x100000
+	movl r1 = 0x4400000
 	movl r8 = initial_stack ;;
 	mov ar.bspstore = r8
Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ kernel/arch/ia64/Makefile.inc	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -88,5 +88,6 @@
 	ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c 
 	DEFS += -DSKI
-	BFD = elf64-ia64-little
+#	BFD = elf64-ia64-little
+	BFD = binary
 endif
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ kernel/arch/ia64/src/ia64.c	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -62,5 +62,5 @@
 	/* Setup usermode init tasks. */
 
-#ifdef I460GX
+//#ifdef I460GX
 	int i;
 	init.cnt = bootinfo->taskmap.count;
@@ -70,4 +70,5 @@
 	    init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
 	}
+/*
 #else	
 	init.cnt = 8;
@@ -88,5 +89,5 @@
 	init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000;
 	init.tasks[7].size = INIT0_SIZE;
-#endif
+#endif*/
 }
 
Index: kernel/arch/ia64/src/start.S
===================================================================
--- kernel/arch/ia64/src/start.S	(revision 0f78e74cdf7e7e866df66fc2c44df51235c66b38)
+++ kernel/arch/ia64/src/start.S	(revision 7a9364c012db248907e89ae68a4ff824510b1345)
@@ -108,7 +108,8 @@
 
 	# initialize gp (Global Pointer) register
-	mov r20 = r1 ;;
+	movl r20 = (VRN_KERNEL << VRN_SHIFT);;
+	or r20 = r20,r1;;
 	movl r1 = _hardcoded_load_address
-
+	
 	/*
 	 * Initialize hardcoded_* variables.