Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2518 → Rev 2519

/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.
*/