Add BAT mapping for nubus, move interrupts deisabling to enter_kernel

This commit is contained in:
Laurent Vivier 2005-05-13 22:35:58 +00:00
parent a3d2b674e2
commit 470a2a6315

View File

@ -322,7 +322,11 @@ int start(emile_l2_header_t* info)
regs.GPR[2] = 0; regs.GPR[2] = 0;
regs.GPR[3] = 'BooX'; regs.GPR[3] = 'BooX';
regs.GPR[4] = (u_int32_t)&bootx_infos; regs.GPR[4] = (u_int32_t)&bootx_infos;
regs.GPR[5] = 0;
/* Set up the info for BAT mapping on Nubus */
regs.GPR[5] = vga_get_videobase() & 0xFF800000UL;
regs.GPR[11] = 1;
printf("\n"); printf("\n");
printf("Physical address of kernel will be 0x%08lx\n", printf("Physical address of kernel will be 0x%08lx\n",
@ -332,10 +336,6 @@ int start(emile_l2_header_t* info)
printf("Ok, booting the kernel.\n"); printf("Ok, booting the kernel.\n");
/* disable interrupt */
asm("ori.w #0x0700,%sr");
/* kick off */ /* kick off */
#ifdef ARCH_M68K #ifdef ARCH_M68K
@ -347,5 +347,7 @@ int start(emile_l2_header_t* info)
enter_kernelPPC((unsigned long)kernel, &regs); enter_kernelPPC((unsigned long)kernel, &regs);
#endif #endif
error("Kernel startup failed");
return 0; return 0;
} }