Changeset 7a9364c in mainline

Timestamp:

2007-09-13T12:50:16Z (17 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

Files:

• boot/arch/ia64/Makefile.inc (modified) (3 diffs)
• boot/arch/ia64/loader/Makefile (modified) (1 diff)
• boot/arch/ia64/loader/asm.S (modified) (1 diff)
• boot/arch/ia64/loader/boot.S (modified) (1 diff)
• kernel/arch/ia64/Makefile.inc (modified) (1 diff)
• kernel/arch/ia64/src/ia64.c (modified) (3 diffs)
• kernel/arch/ia64/src/start.S (modified) (1 diff)

boot/arch/ia64/Makefile.inc

@@ -27 +27 @@
 #
 
-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 +43 @@
 
 
-else
+#else
 
 
@@ -62 +62 @@
 
 
-endif
+#endif

boot/arch/ia64/loader/Makefile

@@ -80 +80 @@
 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)))

boot/arch/ia64/loader/asm.S

@@ -32 +32 @@
 .text
 
-.global halt
-.global memcpy
 .global jump_to_kernel
-
-halt:
-        
-memcpy:
 
 jump_to_kernel:

boot/arch/ia64/loader/boot.S

@@ -37 +37 @@
         mov ar.rsc = r0
 #       movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
-        movl r1 = 0x100000
+        movl r1 = 0x4400000
         movl r8 = initial_stack ;;
         mov ar.bspstore = r8

kernel/arch/ia64/Makefile.inc

@@ -88 +88 @@
         ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c 
         DEFS += -DSKI
-        BFD = elf64-ia64-little
+#       BFD = elf64-ia64-little
+        BFD = binary
 endif
 

kernel/arch/ia64/src/ia64.c

@@ -62 +62 @@
         /* Setup usermode init tasks. */
 
-#ifdef I460GX
+//#ifdef I460GX
         int i;
         init.cnt = bootinfo->taskmap.count;
@@ -70 +70 @@
             init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
         }
+/*
 #else   
         init.cnt = 8;
@@ -88 +89 @@
         init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000;
         init.tasks[7].size = INIT0_SIZE;
-#endif
+#endif*/
 }
 

kernel/arch/ia64/src/start.S

@@ -108 +108 @@
 
         # 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.