| /trunk/kernel/arch/ia64/Makefile.inc |
|---|
| 87,7 → 87,8 |
| ifeq ($(MACHINE),ski) |
| ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c |
| DEFS += -DSKI |
| BFD = elf64-ia64-little |
| # BFD = elf64-ia64-little |
| BFD = binary |
| endif |
| ifeq ($(MACHINE),i460GX) |
| /trunk/kernel/arch/ia64/src/ia64.c |
|---|
| 61,7 → 61,7 |
| { |
| /* Setup usermode init tasks. */ |
| #ifdef I460GX |
| //#ifdef I460GX |
| int i; |
| init.cnt = bootinfo->taskmap.count; |
| for(i=0;i<init.cnt;i++) |
| 69,6 → 69,7 |
| init.tasks[i].addr = ((unsigned long)bootinfo->taskmap.tasks[i].addr)|VRN_MASK; |
| init.tasks[i].size = bootinfo->taskmap.tasks[i].size; |
| } |
| /* |
| #else |
| init.cnt = 8; |
| init.tasks[0].addr = INIT0_ADDRESS; |
| 87,7 → 88,7 |
| init.tasks[6].size = INIT0_SIZE; |
| init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000; |
| init.tasks[7].size = INIT0_SIZE; |
| #endif |
| #endif*/ |
| } |
| void arch_pre_mm_init(void) |
| /trunk/kernel/arch/ia64/src/start.S |
|---|
| 107,9 → 107,10 |
| add r12 = -16, r12 /* allocate a scratch area on the stack */ |
| # 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. |
| */ |
| /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)))) |