shithub: n900

Info  •  Files  •  Log  •  Branches

9: don't set console and kbmap, disable i2c and mmc for now

--- a/sys/src/9/omap/main.c

+++ b/sys/src/9/omap/main.c

@@ -150,8 +150,6 @@

 		snprint(buf, sizeof(buf), "nokia %s", conffile);

 		ksetenv("terminal", buf, 0);

-		ksetenv("console", "2", 0);

-		ksetenv("kbmap", "n900", 0);

 		for(i = 0; i < nconf; i++) {

 			if(*confname[i] != '*')

 				ksetenv(confname[i], confval[i], 0);

@@ -173,7 +171,6 @@

 void

 main(void)

 {

-	uartinit();

 	machinit();

 	mmuinit();

 	plan9iniinit();

@@ -193,6 +190,7 @@

 	initseg();

 	links();

+	uartinit();

 	screeninit();

 	chandevreset();

--- a/sys/src/9/omap/n900

+++ b/sys/src/9/omap/n900

@@ -17,17 +17,11 @@

 	draw	screen

-	kbdtwl		devi2c

-	rtctwl		devi2c

-

 	uart

-	usb

-	i2c

 misc

 	uartomap

-	sdmmc	mmcomap

 	sdloop

 	sdram

@@ -34,10 +28,6 @@

 	dtracysys

 	dtracytimer

 	dtracydev

-

-link

-	i2comap		devi2c

-	mmcomap

 port

 	int cpuserver = 0;