From 470a2a63157e246d0741f63210652693a6221afb Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Fri, 13 May 2005 22:35:58 +0000
Subject: [PATCH] Add BAT mapping for nubus, move interrupts deisabling to
 enter_kernel

---
 second/main.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/second/main.c b/second/main.c
index 0de4af2..68692af 100644
--- a/second/main.c
+++ b/second/main.c
@@ -322,7 +322,11 @@ int start(emile_l2_header_t* info)
 		regs.GPR[2]  = 0;
 		regs.GPR[3]  = 'BooX';
 		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("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");
 
-	/* disable interrupt */
-
-	asm("ori.w #0x0700,%sr");
-
 	/* kick off */
 
 #ifdef ARCH_M68K
@@ -347,5 +347,7 @@ int start(emile_l2_header_t* info)
 		enter_kernelPPC((unsigned long)kernel, &regs);
 #endif
 
+	error("Kernel startup failed");
+
 	return 0;
 }