2 files changed, 18 insertions(+), 1 deletions(-)

M carrera/io.h
M carrera/main.c

@@ 9,6 9,7 @@ enum
 	Devicephys	= 0x80000000,
 	Eisaphys	= 0x90000000,	/* IO port physical */
 	Devicevirt	= 0xE0000000,
+	  MCTgcr	= 0xE0000004,
 	Dmabase		= 0xE0000100,	
 	  R4030ier	= 0xE00000EC,	/* Interrupt enable register */
 	  R4030ipr	= 0xE00000EC,	/* Interrupt pending register */

@@ 424,6 424,22 @@ exit(long type)
 	firmware(type);
 }
 
+ulong
+memsize(void)
+{
+	ulong gcr;
+
+	gcr = IO(ulong, MCTgcr);
+	/* Check for bank one enable -
+	 * assumes both have 4Meg SIMMS
+	 */
+	if(gcr & 0x20){
+		memset(UNCACHED(void, 16*MB), 0, 16*MB);
+		return 32*MB;
+	}
+	return 16*MB;
+}
+
 void
 confinit(void)
 {


@@ 431,7 447,7 @@ confinit(void)
 
 	ktop = PGROUND((ulong)end);
 	ktop = PADDR(ktop);
-	top = (16*1024*1024)/BY2PG;
+	top = memsize()/BY2PG;
 
 	conf.base0 = 0;
 	conf.npage0 = top;