3 files changed, 6 insertions(+), 3 deletions(-)

M carrera/devether.c
M carrera/l.s
M carrera/mem.h

@@ 570,7 570,10 @@ initbufs(Ether *c)
 	int i;
 	uchar *mem, *base;
 
-	mem = xspanalloc(64*1024, 8, 64*1024);
+	/* Put the ethernet buffers in the same place
+	 * as the bootrom
+	 */
+	mem = (void*)(KZERO|0x2000);
 	base = mem;
 	mem = CACHELINE(uchar, mem);
 

@@ 29,7 29,7 @@ TEXT	start(SB), $-4
 
 DBG(0x55aa0000)
 	MOVW	$setR30(SB), R30
-	MOVW	$(BEV|DE|CU1|INTR7|INTR6|INTR5|INTR4|INTR3|INTR2|INTR1|INTR0), R1
+	MOVW	$(CU1|INTR7|INTR6|INTR5|INTR4|INTR3|INTR2|INTR1|INTR0), R1
 	MOVW	R1, M(STATUS)
 	WAIT
 DBG(0x55aa0001)

@@ 162,7 162,7 @@
 #define	TSTKTOP	(0xC0000000+USTKSIZE-BY2PG) /* top of temporary stack */
 #define	TSTKSIZ 100
 #define	KZERO	KSEG0			/* base of kernel address space */
-#define	KTZERO	(KZERO+0x2000)		/* first address in kernel text */
+#define	KTZERO	(KZERO+0x12000)		/* first address in kernel text */
 #define	USTKSIZE	(4*1024*1024)	/* size of user stack */
 #define globalmem(x)	(((ulong)x)&KZERO)	/* addresses valid in all contexts */
 /*