6 files changed, 537 insertions(+), 411 deletions(-)

M port/devboot.c
M power/bboot.c
M power/boot.c
M power/boot.h
M power/l.s
M power/main.c

@@ 104,7 104,6 @@ bootwrite(Chan *c, void *buf, long n)
 	case Qboot:
 		pc = *(ulong*)buf;
 		splhi();
-		flushmmu();
 		gotopc(pc);
 	}
 	error(0, Ebadarg);

@@ 313,7 313,6 @@ int
 readseg(int in, int out, long inoff, long outoff, int len)
 {
 	long	n, i;
-	ulong sum = 0;
 
 	if(seek(in, inoff, 0) < 0){
 		prerror("seeking bootfile");


@@ 328,16 327,11 @@ readseg(int in, int out, long inoff, long outoff, int len)
 			prerror("reading bootfile");
 			return -1;
 		}
-		for(i = 0; i < n; i++)
-			sum += buf[i];
-		if(sum & 0xf0000000)
-			sum = (sum & 0xfffffff) + ((sum & 0xf0000000) >> 28);
 		if(write(out, buf, n) != n){
 			prerror("writing #b/mem");
 			return -1;
 		}
 	}
-	print("[%ux]", sum);
 	return 0;
 }
 

@@ 58,7 58,6 @@ main(int argc, char *argv[])
 	open("#c/cons", 1);
 	open("#c/cons", 1);
 
-	print("boot.c staring\n");
 
 	argv++;
 	argc--;	

@@ 1,7 1,7 @@
 ulong bootcode[]={
 	0x00000407,
-	0x000040f0,
-	0x00000548,
+	0x000040e8,
+	0x00000538,
 	0x000010d0,
 	0x00000000,
 	0x00001020,


@@ 16,7 16,7 @@ ulong bootcode[]={
 	0xafa10004,
 	0x0c000415,
 	0xafa20008,
-	0x0c000722,
+	0x0c00071f,
 	0xafa10004,
 	0x08000411,
 	0x00000027,


@@ 25,547 25,544 @@ ulong bootcode[]={
 	0xafa0000c,
 	0x23c18232,
 	0xafa10004,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa00008,
 	0x23c2823a,
 	0xafa20004,
 	0x20010001,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa10008,
 	0x23c28242,
 	0xafa20004,
 	0x20010001,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa10008,
-	0x23c2824a,
-	0x0c00074d,
-	0xafa20004,
 	0x8fa5000c,
 	0x2007006d,
-	0x8fa1001c,
+	0x8fa2001c,
 	0x20060001,
-	0x8fa20018,
-	0x24230004,
-	0x2444ffff,
+	0x8fa10018,
+	0x24430004,
+	0x2424ffff,
 	0x18800017,
 	0x2008002d,
-	0x8c620000,
+	0x8c610000,
 	0x00000027,
-	0x80420000,
+	0x80210000,
 	0x00000027,
-	0x14480011,
+	0x14280011,
 	0x00000027,
-	0x8c620000,
+	0x8c610000,
 	0x00000027,
-	0x80420001,
+	0x80210001,
 	0x00000027,
-	0x14470002,
+	0x14270002,
 	0x00000027,
 	0x00062825,
 	0x2484ffff,
 	0x18800007,
 	0x24630004,
-	0x8c620000,
+	0x8c610000,
 	0x00000027,
-	0x80420000,
+	0x80210000,
 	0x00000027,
-	0x1048fff1,
+	0x1028fff1,
 	0x00000027,
-	0x23c1825a,
-	0xafc18002,
-	0x23c28264,
-	0x38810001,
-	0x10200029,
-	0xafc28006,
-	0x38810002,
-	0x10200020,
+	0x23c2824a,
+	0xafc28002,
+	0x23c18254,
+	0x38820001,
+	0x10400029,
+	0xafc18006,
+	0x38820002,
+	0x10400020,
 	0x00000027,
-	0x0c000479,
+	0x0c000476,
 	0xafa50004,
 	0x8fc38052,
 	0x00000027,
 	0x18600003,
 	0x00000027,
-	0x0c000e3b,
+	0x0c000e38,
 	0xafa30004,
-	0x8fc18016,
-	0x00000027,
-	0x18200004,
-	0x00000027,
 	0x8fc28016,
-	0x0c000e3b,
-	0xafa20004,
-	0x8fc1801a,
 	0x00000027,
-	0x18200004,
+	0x18400004,
 	0x00000027,
+	0x8fc18016,
+	0x0c000e38,
+	0xafa10004,
 	0x8fc2801a,
-	0x0c000e3b,
-	0xafa20004,
+	0x00000027,
+	0x18400004,
+	0x00000027,
+	0x8fc1801a,
+	0x0c000e38,
+	0xafa10004,
 	0xafc0801a,
 	0xafc08016,
 	0xafc08052,
-	0x20020001,
-	0x0c000479,
-	0xafa20004,
+	0x20010001,
+	0x0c000476,
+	0xafa10004,
 	0x8fc38052,
-	0x08000455,
+	0x08000452,
 	0x00000027,
-	0x8c620000,
-	0x00000027,
-	0xafc28006,
-	0x8c610004,
-	0x08000451,
-	0xafc18002,
 	0x8c610000,
-	0x08000451,
+	0x00000027,
 	0xafc18006,
+	0x8c620004,
+	0x0800044e,
+	0xafc28002,
+	0x8c620000,
+	0x0800044e,
+	0xafc28006,
 	0x23bdffdc,
 	0xafbf0000,
 	0x8fc48002,
-	0x8fa10028,
+	0x8fa20028,
 	0x00000027,
-	0x142001cc,
+	0x144001cc,
 	0x00000027,
-	0x0c000681,
+	0x0c00067e,
 	0xafa40004,
 	0x00012025,
 	0x1480000c,
 	0xafc4802e,
-	0x20020002,
-	0xafa20004,
-	0x23c18273,
-	0xafa10008,
-	0x8fc28002,
-	0x0c000773,
-	0xafa2000c,
+	0x20010002,
+	0xafa10004,
+	0x23c28263,
+	0xafa20008,
+	0x8fc18002,
+	0x0c000770,
+	0xafa1000c,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c18285,
-	0xafa10004,
-	0x8fc28002,
-	0x0c00074d,
-	0xafa20008,
-	0x8fc2802e,
-	0x23c3829e,
+	0x23c28275,
 	0xafa20004,
-	0x0c0007b0,
+	0x8fc18002,
+	0x0c00074a,
+	0xafa10008,
+	0x8fc1802e,
+	0x23c3828e,
+	0xafa10004,
+	0x0c0007ad,
 	0xafa30008,
 	0x14200152,
 	0x20040002,
-	0x23c282a9,
+	0x23c28299,
 	0xafa20004,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa40008,
 	0x04210008,
 	0xafc18052,
-	0x23c182b1,
-	0x0c000659,
+	0x23c182a1,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c28347,
-	0x0c00074d,
+	0x23c28337,
+	0x0c00074a,
 	0xafa20004,
-	0xa3c095ce,
-	0x23c295ce,
+	0xa3c095be,
+	0x23c295be,
 	0xafa20004,
-	0x23c385ce,
-	0x0c0007ee,
+	0x23c385be,
+	0x0c0007eb,
 	0xafa30008,
 	0x00012025,
 	0x8fc18052,
-	0x23c385ce,
+	0x23c385be,
 	0xafa10004,
 	0xafa30008,
 	0xafa40020,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa4000c,
 	0x8fa40020,
 	0x00000027,
 	0x1024000c,
 	0x00000027,
-	0x23c1834e,
+	0x23c1833e,
 	0xafa10004,
-	0x0c00074d,
+	0x0c00074a,
 	0xafa40008,
-	0x23c18356,
-	0x0c000659,
+	0x23c18346,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
 	0x8fc18052,
-	0x23c385ce,
+	0x23c385be,
 	0xafa10004,
 	0xafa30008,
 	0x20011000,
-	0x0c000e59,
+	0x0c000e56,
 	0xafa1000c,
 	0x1c200008,
 	0x00000027,
-	0x23c28360,
-	0x0c000659,
+	0x23c28350,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c285ce,
+	0x23c285be,
 	0xafa20004,
-	0x23c395ce,
+	0x23c395be,
 	0xafa30008,
 	0xafa10020,
-	0x0c000b8b,
+	0x0c000b88,
 	0xafa1000c,
 	0x14200019,
 	0x00000027,
-	0x23c18369,
+	0x23c18359,
 	0xafa10004,
 	0x8fa20020,
 	0x00000027,
 	0xafa20008,
-	0x83c185ce,
+	0x83c185be,
 	0x00000027,
 	0xafa1000c,
-	0x83c285cf,
+	0x83c285bf,
 	0x00000027,
 	0xafa20010,
-	0x83c185d0,
+	0x83c185c0,
 	0x00000027,
 	0xafa10014,
-	0x83c285d1,
-	0x0c00074d,
+	0x83c285c1,
+	0x0c00074a,
 	0xafa20018,
-	0x23c1838c,
-	0x0c000659,
+	0x23c1837c,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x83c295ce,
+	0x83c295be,
 	0x20010001,
 	0x10410008,
 	0x00000027,
-	0x23c28397,
-	0x0c000659,
+	0x23c28387,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c183a0,
-	0x0c00074d,
+	0x23c18390,
+	0x0c00074a,
 	0xafa10004,
 	0x20020002,
-	0xa3c295ce,
+	0xa3c295be,
 	0x20010076,
-	0xa3c195da,
-	0x23c195ce,
+	0xa3c195ca,
+	0x23c195be,
 	0xafa10004,
-	0x23c385ce,
-	0x0c0007ee,
+	0x23c385be,
+	0x0c0007eb,
 	0xafa30008,
 	0x8fc28052,
-	0x23c385ce,
+	0x23c385be,
 	0xafa20004,
 	0xafa30008,
 	0xafa10020,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa1000c,
 	0x8fa30020,
 	0x00000027,
 	0x10230008,
 	0x00000027,
-	0x23c183ab,
-	0x0c000659,
+	0x23c1839b,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
 	0x8fc18052,
-	0x23c385ce,
+	0x23c385be,
 	0xafa10004,
 	0xafa30008,
 	0x20011000,
-	0x0c000e59,
+	0x0c000e56,
 	0xafa1000c,
 	0x1c200008,
 	0x00000027,
-	0x23c283b9,
-	0x0c000659,
+	0x23c283a9,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c285ce,
+	0x23c285be,
 	0xafa20004,
-	0x23c395ce,
+	0x23c395be,
 	0xafa30008,
-	0x0c000b8b,
+	0x0c000b88,
 	0xafa1000c,
 	0x14200008,
 	0x00000027,
-	0x23c183c6,
-	0x0c000659,
+	0x23c183b6,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x83c295ce,
+	0x83c295be,
 	0x20010003,
 	0x10410008,
 	0x00000027,
-	0x23c283d5,
-	0x0c000659,
+	0x23c283c5,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x87c195d2,
+	0x87c195c2,
 	0x00000027,
 	0x1020000d,
 	0x00000027,
-	0x23c283e2,
+	0x23c283d2,
 	0xafa20004,
-	0x87c195d2,
-	0x0c00074d,
+	0x87c195c2,
+	0x0c00074a,
 	0xafa10008,
-	0x23c283ec,
-	0x0c000659,
+	0x23c283dc,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c183f9,
-	0x0c00074d,
+	0x23c183e9,
+	0x0c00074a,
 	0xafa10004,
-	0x23c285ce,
+	0x23c285be,
 	0xafa20004,
-	0x23c18401,
+	0x23c183f1,
 	0xafa10008,
 	0x8fc28002,
-	0x0c000798,
+	0x0c000795,
 	0xafa2000c,
-	0x23c285ce,
+	0x23c285be,
 	0xafa20004,
 	0x20030001,
 	0xafa30008,
 	0x200201b6,
-	0x0c000e40,
+	0x0c000e3d,
 	0xafa2000c,
 	0x04210004,
 	0xafa1001c,
-	0x23c18407,
-	0x0c00066c,
+	0x23c183f7,
+	0x0c000669,
 	0xafa10004,
-	0x23c285ce,
+	0x23c285be,
 	0xafa20004,
-	0x23c1840e,
+	0x23c183fe,
 	0xafa10008,
 	0x8fc28052,
-	0x0c000798,
+	0x0c000795,
 	0xafa2000c,
-	0x23c385ce,
-	0x0c0007d3,
+	0x23c385be,
+	0x0c0007d0,
 	0xafa30004,
 	0xafa10018,
-	0x23c385ce,
-	0x0c0007d3,
+	0x23c385be,
+	0x0c0007d0,
 	0xafa30004,
 	0xafa10014,
 	0x8fa3001c,
-	0x23c185ce,
+	0x23c185be,
 	0xafa30004,
 	0xafa10008,
 	0x8fa30014,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa3000c,
 	0x00011025,
 	0x8fa10018,
 	0x00000027,
 	0x10410004,
 	0x00000027,
-	0x23c28411,
-	0x0c00066c,
+	0x23c28401,
+	0x0c000669,
 	0xafa20004,
 	0x8fa1001c,
-	0x0c000e3b,
+	0x0c000e38,
 	0xafa10004,
-	0x23c18417,
+	0x23c18407,
 	0xafa10004,
 	0x20030001,
 	0xafa30008,
 	0x200101b6,
-	0x0c000e40,
+	0x0c000e3d,
 	0xafa1000c,
 	0x04210004,
 	0xafa1001c,
-	0x23c2841f,
-	0x0c00066c,
+	0x23c2840f,
+	0x0c000669,
 	0xafa20004,
-	0x23c185ce,
+	0x23c185be,
 	0xafa10004,
-	0x23c28426,
+	0x23c28416,
 	0xafa20008,
 	0x8fc18052,
-	0x0c000798,
+	0x0c000795,
 	0xafa1000c,
-	0x23c285ce,
-	0x0c0007d3,
+	0x23c285be,
+	0x0c0007d0,
 	0xafa20004,
 	0xafa10018,
-	0x23c385ce,
-	0x0c0007d3,
+	0x23c385be,
+	0x0c0007d0,
 	0xafa30004,
 	0xafa10014,
 	0x8fa3001c,
-	0x23c185ce,
+	0x23c185be,
 	0xafa30004,
 	0xafa10008,
 	0x8fa30014,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa3000c,
 	0x00011025,
 	0x8fa10018,
 	0x00000027,
 	0x10410004,
 	0x00000027,
-	0x23c28429,
-	0x0c00066c,
+	0x23c28419,
+	0x0c000669,
 	0xafa20004,
 	0x8fa1001c,
-	0x0c000e3b,
+	0x0c000e38,
 	0xafa10004,
-	0x23c2842f,
-	0x0c00074d,
+	0x23c2841f,
+	0x0c00074a,
 	0xafa20004,
-	0x23c28438,
+	0x23c28428,
 	0xafa20004,
-	0x23c3843a,
+	0x23c3842a,
 	0xafa30008,
-	0x0c000e36,
+	0x0c000e33,
 	0xafa0000c,
 	0x04210004,
 	0x00000027,
-	0x23c1843c,
-	0x0c00066c,
+	0x23c1842c,
+	0x0c000669,
 	0xafa10004,
 	0x8fc18052,
-	0x23c38441,
+	0x23c38431,
 	0xafa10004,
 	0xafa30008,
 	0x20010006,
 	0xafa1000c,
-	0x23c38443,
-	0x0c000e4f,
+	0x23c38433,
+	0x0c000e4c,
 	0xafa30010,
 	0x04210004,
 	0x00000027,
-	0x23c18444,
-	0x0c00066c,
+	0x23c18434,
+	0x0c000669,
 	0xafa10004,
-	0x23c2844a,
-	0x0c00074d,
+	0x23c2843a,
+	0x0c00074a,
 	0xafa20004,
-	0x23c18453,
+	0x23c18443,
 	0xafa10004,
-	0x23c2845e,
+	0x23c2844e,
 	0xafa20008,
-	0x0c0007e2,
+	0x0c0007df,
 	0xafa0000c,
-	0x23c18463,
-	0x0c00066c,
+	0x23c18453,
+	0x0c000669,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c182c1,
+	0x23c182b1,
 	0xafa10004,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa40008,
 	0x04210008,
 	0xafc1801a,
-	0x23c282ca,
-	0x0c000659,
+	0x23c282ba,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
 	0xafa10004,
-	0x23c382db,
+	0x23c382cb,
 	0xafa30008,
 	0x2002000d,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa2000c,
 	0x04210008,
 	0x00000027,
-	0x23c182e9,
-	0x0c000659,
+	0x23c182d9,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
 	0x8fc1801a,
-	0x23c382f7,
+	0x23c382e7,
 	0xafa10004,
 	0xafa30008,
 	0x2001000c,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa1000c,
 	0x04210008,
 	0x00000027,
-	0x23c28304,
-	0x0c000659,
+	0x23c282f4,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c28311,
+	0x23c28301,
 	0xafa20004,
 	0x20030002,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa30008,
 	0x04210008,
 	0xafc18052,
-	0x23c1831b,
-	0x0c000659,
+	0x23c1830b,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c1832d,
+	0x23c1831d,
 	0xafa10004,
 	0x20030002,
-	0x0c000e54,
+	0x0c000e51,
 	0xafa30008,
 	0x04210008,
 	0xafc18016,
-	0x23c28336,
-	0x0c000659,
+	0x23c28326,
+	0x0c000656,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
 	0x8fc3802e,
-	0x0c0007d3,
+	0x0c0007d0,
 	0xafa30004,
 	0xafa10018,
 	0x8fc38016,


@@ 575,45 572,45 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa20008,
 	0x8fa30018,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa3000c,
 	0x0421fe66,
 	0x00000027,
 	0x8fc1802e,
-	0x0c000659,
+	0x0c000656,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0024,
-	0x23c1826c,
-	0xafa10004,
+	0x23c2825c,
+	0xafa20004,
 	0xafa40008,
-	0x23c1808e,
-	0xafa1000c,
-	0x20020038,
-	0x0c0006c4,
-	0xafa20010,
+	0x23c2808e,
+	0xafa2000c,
+	0x20010038,
+	0x0c0006c1,
+	0xafa10010,
 	0x23c4808e,
 	0xafc48002,
-	0x0c000681,
+	0x0c00067e,
 	0xafa40004,
-	0x08000483,
+	0x08000480,
 	0x00012025,
 	0x23bdffac,
 	0xafbf0000,
 	0xafa00004,
 	0x23a20014,
-	0x0c000e45,
+	0x0c000e42,
 	0xafa20008,
 	0x20010002,
 	0xafa10004,
-	0x23c2846e,
+	0x23c2845e,
 	0xafa20008,
 	0x8fa10058,
 	0x23a20014,
 	0xafa1000c,
-	0x0c000773,
+	0x0c000770,
 	0xafa20010,
 	0x8fa20000,
 	0x00000027,


@@ 623,18 620,18 @@ ulong bootcode[]={
 	0xafbf0000,
 	0xafa00004,
 	0x23a10014,
-	0x0c000e45,
+	0x0c000e42,
 	0xafa10008,
 	0x20020002,
 	0xafa20004,
-	0x23c1847c,
+	0x23c1846c,
 	0xafa10008,
 	0x8fa20058,
 	0x23a10014,
 	0xafa2000c,
-	0x0c000773,
+	0x0c000770,
 	0xafa10010,
-	0x0c000731,
+	0x0c00072e,
 	0xafa00004,
 	0x8fa20000,
 	0x00000027,


@@ 643,16 640,16 @@ ulong bootcode[]={
 	0x23bdfff0,
 	0xafbf0000,
 	0x8fa10014,
-	0x23c3848a,
+	0x23c3847a,
 	0xafa10004,
-	0x0c0007b0,
+	0x0c0007ad,
 	0xafa30008,
 	0x10200025,
 	0x00000027,
 	0x8fa20014,
-	0x23c3848c,
+	0x23c3847c,
 	0xafa20004,
-	0x0c0007b0,
+	0x0c0007ad,
 	0xafa30008,
 	0x1020001e,
 	0x00000027,


@@ 666,7 663,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa20004,
 	0x8fa30014,
-	0x0c0007b0,
+	0x0c0007ad,
 	0xafa30008,
 	0x8fa4000c,
 	0x14200006,


@@ 690,11 687,11 @@ ulong bootcode[]={
 	0x00000027,
 	0x1020000e,
 	0x00000027,
-	0x23c28491,
+	0x23c28481,
 	0xafa20004,
 	0xafa4000c,
 	0x8c810000,
-	0x0c00074d,
+	0x0c00074a,
 	0xafa10008,
 	0x8fa2000c,
 	0x00000027,


@@ 709,29 706,29 @@ ulong bootcode[]={
 	0x00000825,
 	0x23bdffec,
 	0xafbf0000,
-	0x23c18495,
+	0x23c18485,
 	0xafa10004,
 	0x8fa20018,
 	0x00000027,
 	0xafa20008,
 	0x8fa1001c,
-	0x0c00074d,
+	0x0c00074a,
 	0xafa1000c,
 	0xafa00004,
 	0x8fa10020,
 	0x00000027,
 	0xafa10008,
 	0x8fa30024,
-	0x0c000e59,
+	0x0c000e56,
 	0xafa3000c,
 	0x14200003,
 	0x00012025,
-	0x080006c6,
+	0x080006c3,
 	0x00000027,
 	0x04210006,
 	0xafa10010,
-	0x23c2849e,
-	0x0c00066c,
+	0x23c2848e,
+	0x0c000669,
 	0xafa20004,
 	0x8fa40010,
 	0x00000027,


@@ 742,7 739,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa10004,
 	0x8fa2001c,
-	0x0c0007c6,
+	0x0c0007c3,
 	0xafa20008,
 	0x8fa40010,
 	0x8fa20000,


@@ 761,7 758,7 @@ ulong bootcode[]={
 	0x00002025,
 	0x28810021,
 	0x10200011,
-	0x23c5854a,
+	0x23c5853a,
 	0x00040880,
 	0x00250821,
 	0x8c210000,


@@ 786,7 783,7 @@ ulong bootcode[]={
 	0x00001825,
 	0x28610021,
 	0x1020000d,
-	0x23c4854a,
+	0x23c4853a,
 	0x00030880,
 	0x00240821,
 	0x8c210000,


@@ 807,10 804,10 @@ ulong bootcode[]={
 	0x00000027,
 	0x14200003,
 	0x00000027,
-	0x0c000731,
+	0x0c00072e,
 	0xafa00004,
 	0x23c2803a,
-	0x0c000731,
+	0x0c00072e,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,


@@ 818,7 815,7 @@ ulong bootcode[]={
 	0x23bd0008,
 	0x23bdfff0,
 	0xafbf0000,
-	0x23c5854a,
+	0x23c5853a,
 	0x20030020,
 	0x04600010,
 	0x00000027,


@@ 834,11 831,11 @@ ulong bootcode[]={
 	0x0080f809,
 	0xac200000,
 	0x8fa3000c,
-	0x23c5854a,
-	0x08000735,
+	0x23c5853a,
+	0x08000732,
 	0x2463ffff,
 	0x8fa20014,
-	0x0c000e31,
+	0x0c000e2e,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,


@@ 854,7 851,7 @@ ulong bootcode[]={
 	0x23a31020,
 	0xafa2000c,
 	0x24630004,
-	0x0c000e9b,
+	0x0c000e98,
 	0xafa30010,
 	0x23a5001c,
 	0x00012025,


@@ 862,7 859,7 @@ ulong bootcode[]={
 	0xafa10004,
 	0xafa50008,
 	0x00850823,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa1000c,
 	0xafa10014,
 	0x0421000c,


@@ 874,7 871,7 @@ ulong bootcode[]={
 	0x14200006,
 	0xafc2800a,
 	0x20010001,
-	0x0c000722,
+	0x0c00071f,
 	0xafa10004,
 	0x8fa40014,
 	0x00000027,


@@ 892,14 889,14 @@ ulong bootcode[]={
 	0x23a31024,
 	0xafa1000c,
 	0x24630004,
-	0x0c000e9b,
+	0x0c000e98,
 	0xafa30010,
 	0x8fa21020,
 	0x23a5001c,
 	0xafa20004,
 	0xafa50008,
 	0x00251023,
-	0x0c000e5e,
+	0x0c000e5b,
 	0xafa2000c,
 	0xafa10014,
 	0x0421000c,


@@ 911,7 908,7 @@ ulong bootcode[]={
 	0x14400006,
 	0xafc1800a,
 	0x20020001,
-	0x0c000722,
+	0x0c00071f,
 	0xafa20004,
 	0x8fa40014,
 	0x00000027,


@@ 931,7 928,7 @@ ulong bootcode[]={
 	0x23a30024,
 	0xafa2000c,
 	0x24630004,
-	0x0c000e9b,
+	0x0c000e98,
 	0xafa30010,
 	0x8fa20014,
 	0x00000027,


@@ 999,7 996,7 @@ ulong bootcode[]={
 	0x23a30010,
 	0xafa20004,
 	0x24630004,
-	0x0c000e4a,
+	0x0c000e47,
 	0xafa30008,
 	0x8fa20000,
 	0x00000027,


@@ 1045,7 1042,7 @@ ulong bootcode[]={
 	0x23c180ca,
 	0xafa10004,
 	0x80820000,
-	0x0c00074d,
+	0x0c00074a,
 	0xafa20008,
 	0x8fa20000,
 	0x23bd0014,


@@ 1088,7 1085,7 @@ ulong bootcode[]={
 	0xafa10004,
 	0x24810008,
 	0xafa10008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa10010,
 	0x2002001c,


@@ 1099,7 1096,7 @@ ulong bootcode[]={
 	0x00000027,
 	0x24210024,
 	0xafa10008,
-	0x0c001373,
+	0x0c001370,
 	0xafa2000c,
 	0x8fa10010,
 	0x8fa2001c,


@@ 1118,7 1115,7 @@ ulong bootcode[]={
 	0x3822000d,
 	0x10400003,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84810002,
 	0x00000027,


@@ 1209,7 1206,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0x2482000c,
 	0xafa20008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa20010,
 	0x00000027,


@@ 1238,7 1235,7 @@ ulong bootcode[]={
 	0x38220012,
 	0x10400003,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84820002,
 	0x24a10002,


@@ 1251,7 1248,7 @@ ulong bootcode[]={
 	0xafa10004,
 	0x2481000c,
 	0xafa10008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa60018,
 	0x8fa10010,


@@ 1310,7 1307,7 @@ ulong bootcode[]={
 	0x38220016,
 	0x10400003,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84810002,
 	0x00000027,


@@ 1351,7 1348,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa20008,
 	0x8c81000c,
-	0x0c001373,
+	0x0c001370,
 	0xafa1000c,
 	0x8fa20018,
 	0x8fa10010,


@@ 1392,7 1389,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa10008,
 	0x8c82000c,
-	0x0c001373,
+	0x0c001370,
 	0xafa2000c,
 	0x8fa10018,
 	0x8fa20010,


@@ 1496,7 1493,7 @@ ulong bootcode[]={
 	0x3822001b,
 	0x1040fe89,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84820002,
 	0x00000027,


@@ 1521,7 1518,7 @@ ulong bootcode[]={
 	0x3822001f,
 	0x1040fe70,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84810002,
 	0x24a20002,


@@ 1534,7 1531,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0x24820008,
 	0xafa20008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa20010,
 	0x00000027,


@@ 1564,7 1561,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0x24820008,
 	0xafa20008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa20010,
 	0x00000027,


@@ 1611,7 1608,7 @@ ulong bootcode[]={
 	0x38220023,
 	0x10400003,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84820002,
 	0x00000027,


@@ 1631,7 1628,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0x24820008,
 	0xafa20008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa20010,
 	0x00000027,


@@ 1682,7 1679,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0x24820008,
 	0xafa20008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa20010,
 	0x00000027,


@@ 1703,7 1700,7 @@ ulong bootcode[]={
 	0x38220027,
 	0x1040ff00,
 	0x00000027,
-	0x08000813,
+	0x08000810,
 	0x00000027,
 	0x84820002,
 	0x00000027,


@@ 1745,7 1742,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa20008,
 	0x8c81000c,
-	0x0c001373,
+	0x0c001370,
 	0xafa1000c,
 	0x8fa20018,
 	0x8fa10010,


@@ 1787,7 1784,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa10008,
 	0x8c82000c,
-	0x0c001373,
+	0x0c001370,
 	0xafa2000c,
 	0x8fa10018,
 	0x8fa20010,


@@ 1810,7 1807,7 @@ ulong bootcode[]={
 	0x8fa10018,
 	0x00000027,
 	0xafa10008,
-	0x0c001373,
+	0x0c001370,
 	0xafa2000c,
 	0x8fa30018,
 	0x8fa10010,


@@ 1972,7 1969,7 @@ ulong bootcode[]={
 	0x23c280d8,
 	0xafa20004,
 	0x80a10000,
-	0x0c00074d,
+	0x0c00074a,
 	0xafa10008,
 	0x8fa20000,
 	0x23bd0014,


@@ 2003,7 2000,7 @@ ulong bootcode[]={
 	0x80210000,
 	0x00000027,
 	0xa0a1000c,
-	0x08000bc1,
+	0x08000bbe,
 	0x24840001,
 	0x90820000,
 	0x90810001,


@@ 2015,7 2012,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa10010,
 	0x8fa2001c,


@@ 2025,10 2022,10 @@ ulong bootcode[]={
 	0xafa40010,
 	0xafa40008,
 	0x2002001c,
-	0x0c001373,
+	0x0c001370,
 	0xafa2000c,
 	0x8fa10010,
-	0x08000bc1,
+	0x08000bbe,
 	0x2424001c,
 	0x3841000b,
 	0x10200023,


@@ 2039,7 2036,7 @@ ulong bootcode[]={
 	0x3841000d,
 	0x10200003,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90810000,
 	0x90820001,


@@ 2052,7 2049,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00021200,
 	0x00220825,
-	0x08000bc1,
+	0x08000bbe,
 	0xa4a10004,
 	0x90820000,
 	0x90810001,


@@ 2065,7 2062,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00010a00,
 	0x00411025,
-	0x08000bc1,
+	0x08000bbe,
 	0xa4a2000a,
 	0x90810000,
 	0x90820001,


@@ 2090,7 2087,7 @@ ulong bootcode[]={
 	0x00021600,
 	0x00220825,
 	0x24840004,
-	0x08000bc1,
+	0x08000bbe,
 	0xaca10010,
 	0x90820000,
 	0x90810001,


@@ 2102,10 2099,10 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa10010,
-	0x08000bc1,
+	0x08000bbe,
 	0x2424001c,
 	0x2441ffed,
 	0x1c20003c,


@@ 2124,7 2121,7 @@ ulong bootcode[]={
 	0x38410012,
 	0x10200003,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90820000,
 	0x90810001,


@@ 2136,7 2133,7 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa5001c,
 	0x8fa10010,


@@ 2156,7 2153,7 @@ ulong bootcode[]={
 	0x24810004,
 	0x24240001,
 	0x80210000,
-	0x08000bc1,
+	0x08000bbe,
 	0xa0a10028,
 	0x90820000,
 	0x90810001,


@@ 2167,7 2164,7 @@ ulong bootcode[]={
 	0x24810002,
 	0x24240001,
 	0x80210000,
-	0x08000bc1,
+	0x08000bbe,
 	0xa0a10028,
 	0x38410014,
 	0x1020003b,


@@ 2178,7 2175,7 @@ ulong bootcode[]={
 	0x38410016,
 	0x10200003,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90820000,
 	0x90810001,


@@ 2206,7 2203,7 @@ ulong bootcode[]={
 	0xaca2000c,
 	0xaca40010,
 	0x8ca2000c,
-	0x08000bc1,
+	0x08000bbe,
 	0x00822021,
 	0x90810000,
 	0x90820001,


@@ 2228,7 2225,7 @@ ulong bootcode[]={
 	0xaca1000c,
 	0xaca40010,
 	0x8ca1000c,
-	0x08000bc1,
+	0x08000bbe,
 	0x00812021,
 	0x90820000,
 	0x90810001,


@@ 2253,7 2250,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00010a00,
 	0x00411025,
-	0x08000bc1,
+	0x08000bbe,
 	0xaca2000c,
 	0x90820000,
 	0x90810001,


@@ 2272,7 2269,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00010a00,
 	0x00411025,
-	0x08000bc1,
+	0x08000bbe,
 	0xaca2000c,
 	0x2441ffe0,
 	0x1c200059,


@@ 2296,14 2293,14 @@ ulong bootcode[]={
 	0x3841001b,
 	0x1020ff02,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90810000,
 	0x90820001,
 	0x24840002,
 	0x00021200,
 	0x00220825,
-	0x08000bc1,
+	0x08000bbe,
 	0xa4a10002,
 	0x3841001d,
 	0x10200018,


@@ 2314,7 2311,7 @@ ulong bootcode[]={
 	0x3841001f,
 	0x1020fef0,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90810000,
 	0x90820001,


@@ 2326,10 2323,10 @@ ulong bootcode[]={
 	0xafa10004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa20010,
-	0x08000bc1,
+	0x08000bbe,
 	0x24440040,
 	0x90820000,
 	0x90810001,


@@ 2347,10 2344,10 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa10010,
-	0x08000bc1,
+	0x08000bbe,
 	0x24240040,
 	0x90810000,
 	0x90820001,


@@ 2363,7 2360,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00021200,
 	0x00220825,
-	0x08000bc1,
+	0x08000bbe,
 	0xa4a10004,
 	0x2441ffdc,
 	0x1c200045,


@@ 2379,7 2376,7 @@ ulong bootcode[]={
 	0x38410023,
 	0x10200003,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90820000,
 	0x90810001,


@@ 2397,10 2394,10 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa6000c,
 	0x8fa10010,
-	0x08000bc1,
+	0x08000bbe,
 	0x2424001c,
 	0x90810000,
 	0x90820001,


@@ 2413,7 2410,7 @@ ulong bootcode[]={
 	0x24840002,
 	0x00021200,
 	0x00220825,
-	0x08000bc1,
+	0x08000bbe,
 	0xa4a10008,
 	0x90820000,
 	0x90810001,


@@ 2431,10 2428,10 @@ ulong bootcode[]={
 	0xafa20004,
 	0xafa40010,
 	0xafa40008,
-	0x0c001373,
+	0x0c001370,
 	0xafa7000c,
 	0x8fa10010,
-	0x08000bc1,
+	0x08000bbe,
 	0x24240040,
 	0x38410025,
 	0x10200027,


@@ 2445,7 2442,7 @@ ulong bootcode[]={
 	0x38410027,
 	0x1020ff43,
 	0x00000027,
-	0x08000bb2,
+	0x08000baf,
 	0x00000027,
 	0x90810000,
 	0x90820001,


@@ 2475,7 2472,7 @@ ulong bootcode[]={
 	0x24440001,
 	0xaca40010,
 	0x8ca2000c,
-	0x08000bc1,
+	0x08000bbe,
 	0x00822021,
 	0x90820000,
 	0x90810001,


@@ 2499,7 2496,7 @@ ulong bootcode[]={
 	0x24240001,
 	0xaca40010,
 	0x8ca1000c,
-	0x08000bc1,
+	0x08000bbe,
 	0x00812021,
 	0x23bdffec,
 	0xafbf0000,


@@ 2510,7 2507,7 @@ ulong bootcode[]={
 	0xafa40010,
 	0xafa40008,
 	0x2001001c,
-	0x0c001373,
+	0x0c001370,
 	0xafa1000c,
 	0x8fa4001c,
 	0x8fa20010,


@@ 2660,7 2657,7 @@ ulong bootcode[]={
 	0x23bd0004,
 	0x23bdfffc,
 	0x8fc680c6,
-	0x23c484c6,
+	0x23c484b6,
 	0x83a1000b,
 	0x00000027,
 	0x3021007f,


@@ 2708,7 2705,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa2000c,
 	0x8fa30020,
-	0x0c000e9b,
+	0x0c000e98,
 	0xafa30010,
 	0x8fa20000,
 	0x00000027,


@@ 2765,7 2762,7 @@ ulong bootcode[]={
 	0x24210001,
 	0x148b0003,
 	0xafc1800e,
-	0x08000eae,
+	0x08000eab,
 	0xafc7800e,
 	0x20010009,
 	0x1481ffdc,


@@ 2775,7 2772,7 @@ ulong bootcode[]={
 	0x24420007,
 	0x201cfff8,
 	0x005c1024,
-	0x08000eae,
+	0x08000eab,
 	0xafc2800e,
 	0x00075025,
 	0x00062025,


@@ 2808,7 2805,7 @@ ulong bootcode[]={
 	0xafa8000c,
 	0xafaa0024,
 	0xafaa0010,
-	0x23c184c6,
+	0x23c184b6,
 	0x3082007f,
 	0x00220821,
 	0x80210000,


@@ 2834,9 2831,9 @@ ulong bootcode[]={
 	0x24c60001,
 	0xafa6003c,
 	0x80840000,
-	0x08000eed,
+	0x08000eea,
 	0x00615025,
-	0x08000eae,
+	0x08000eab,
 	0x00a42821,
 	0x00062025,
 	0x24c60001,


@@ 2850,7 2847,7 @@ ulong bootcode[]={
 	0x24c60001,
 	0xafa6003c,
 	0x80840000,
-	0x08000eed,
+	0x08000eea,
 	0x24a50004,
 	0x28820030,
 	0x1440ffc6,


@@ 2859,7 2856,7 @@ ulong bootcode[]={
 	0x0024182a,
 	0x10600003,
 	0x00000027,
-	0x08000eed,
+	0x08000eea,
 	0x00000027,
 	0x05010002,
 	0x00000027,


@@ 2871,7 2868,7 @@ ulong bootcode[]={
 	0x24c60001,
 	0xafa6003c,
 	0x80840000,
-	0x08000f25,
+	0x08000f22,
 	0x2428ffd0,
 	0x2001002d,
 	0x14810006,


@@ 2890,7 2887,7 @@ ulong bootcode[]={
 	0x00000027,
 	0x1180ffa0,
 	0x00000027,
-	0x08000eea,
+	0x08000ee7,
 	0x00e94823,
 	0x012b0018,
 	0x00000812,


@@ 2899,7 2896,7 @@ ulong bootcode[]={
 	0x24c60001,
 	0xafa6003c,
 	0x80840000,
-	0x08000f42,
+	0x08000f3f,
 	0x2429ffd0,
 	0x23bdffb4,
 	0xafbf0000,


@@ 2960,7 2957,7 @@ ulong bootcode[]={
 	0x8fa20054,
 	0x2001ffff,
 	0xafa20008,
-	0x0c000feb,
+	0x0c000fe8,
 	0xafa1000c,
 	0x8fa1001c,
 	0x8fa20000,


@@ 2976,15 2973,15 @@ ulong bootcode[]={
 	0x00000027,
 	0x1ca00003,
 	0x00000027,
-	0x08000f86,
+	0x08000f83,
 	0x00000027,
-	0x08000f7b,
+	0x08000f78,
 	0x2484ffff,
 	0x000d6025,
-	0x08000f79,
+	0x08000f76,
 	0x00c52823,
 	0x8ca50000,
-	0x08000f74,
+	0x08000f71,
 	0xafa4001c,
 	0x8ca20000,
 	0xafa4001c,


@@ 2992,13 2989,13 @@ ulong bootcode[]={
 	0x00052c03,
 	0x00050c00,
 	0x00010c03,
-	0x08000f74,
+	0x08000f71,
 	0x00012825,
 	0x8ca50000,
-	0x08000f74,
+	0x08000f71,
 	0xafa4001c,
 	0x8ca50000,
-	0x08000f74,
+	0x08000f71,
 	0xafa4001c,
 	0x38410006,
 	0x10200029,


@@ 3006,7 3003,7 @@ ulong bootcode[]={
 	0x38410009,
 	0x10200003,
 	0x00000027,
-	0x08000f72,
+	0x08000f6f,
 	0x00000027,
 	0x8ca50000,
 	0x00000027,


@@ 3028,7 3025,7 @@ ulong bootcode[]={
 	0x28820002,
 	0x10400003,
 	0x00000027,
-	0x08000f86,
+	0x08000f83,
 	0x00000027,
 	0x00a8001a,
 	0x04e00005,


@@ 3039,16 3036,16 @@ ulong bootcode[]={
 	0x00000027,
 	0x1ca00003,
 	0x00000027,
-	0x08000f86,
+	0x08000f83,
 	0x00000027,
-	0x08000fc9,
+	0x08000fc6,
 	0x2484ffff,
 	0x8ca10000,
 	0xafa4001c,
 	0x00012c00,
 	0x00052c03,
 	0x30a2ffff,
-	0x08000f74,
+	0x08000f71,
 	0x00022825,
 	0x23bdfff0,
 	0x8faa0014,


@@ 3138,7 3135,7 @@ ulong bootcode[]={
 	0x24e20007,
 	0x201cfff8,
 	0x005c3824,
-	0x08001024,
+	0x08001021,
 	0xafc7800e,
 	0x23bdfff0,
 	0xafbf0000,


@@ 3146,7 3143,7 @@ ulong bootcode[]={
 	0xafa10004,
 	0xafa00008,
 	0x2002ffff,
-	0x0c000feb,
+	0x0c000fe8,
 	0xafa2000c,
 	0x8fa20000,
 	0x23bd0010,


@@ 3164,7 3161,7 @@ ulong bootcode[]={
 	0x8fa1001c,
 	0x2002ffff,
 	0xafa10008,
-	0x0c000feb,
+	0x0c000fe8,
 	0xafa2000c,
 	0x8fa20000,
 	0x23bd0014,


@@ 3184,7 3181,7 @@ ulong bootcode[]={
 	0x8fa20028,
 	0x2003000a,
 	0xafa20010,
-	0x0c000f56,
+	0x0c000f53,
 	0xafa30014,
 	0x8fa20000,
 	0x00000027,


@@ 3220,7 3217,7 @@ ulong bootcode[]={
 	0x8fa30028,
 	0x20020008,
 	0xafa30010,
-	0x0c000f56,
+	0x0c000f53,
 	0xafa20014,
 	0x8fa20000,
 	0x00000027,


@@ 3237,7 3234,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xafa20008,
 	0x8fa1001c,
-	0x0c000feb,
+	0x0c000fe8,
 	0xafa1000c,
 	0x8fa20000,
 	0x23bd0010,


@@ 3261,7 3258,7 @@ ulong bootcode[]={
 	0x8fa30028,
 	0x20020010,
 	0xafa30010,
-	0x0c000f56,
+	0x0c000f53,
 	0xafa20014,
 	0x8fa20000,
 	0x00000027,


@@ 3317,7 3314,7 @@ ulong bootcode[]={
 	0x23a1002c,
 	0xe7a10004,
 	0xe7a00008,
-	0x0c0012d7,
+	0x0c0012d4,
 	0xafa1000c,
 	0xc7c18032,
 	0xc7c08036,


@@ 3332,7 3329,7 @@ ulong bootcode[]={
 	0x00012843,
 	0xafa50028,
 	0x00050823,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0xc7a30094,
 	0xc7a20098,


@@ 3344,7 3341,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x00000027,
 	0x00220823,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0x8fad00a8,
 	0x00007025,


@@ 3367,7 3364,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x00000027,
 	0x00220823,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0x8fad00a8,
 	0x8faa00a0,


@@ 3376,7 3373,7 @@ ulong bootcode[]={
 	0xc7a20034,
 	0x23a80040,
 	0x46201102,
-	0x0800111c,
+	0x08001119,
 	0x00007025,
 	0xc7c1801e,
 	0xc7c08022,


@@ 3393,7 3390,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x00000027,
 	0x00220823,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0x8fad00a8,
 	0x8faa00a0,


@@ 3402,7 3399,7 @@ ulong bootcode[]={
 	0xc7a20034,
 	0x23a80040,
 	0x46201102,
-	0x08001133,
+	0x08001130,
 	0x00007025,
 	0x05410002,
 	0x00000027,


@@ 3437,7 3434,7 @@ ulong bootcode[]={
 	0x200affff,
 	0xafaa00a0,
 	0x200d0065,
-	0x080010e9,
+	0x080010e6,
 	0xafad00a8,
 	0x000e3825,
 	0x00e5182a,


@@ 3486,7 3483,7 @@ ulong bootcode[]={
 	0x24c60001,
 	0x2463fff6,
 	0xa0230001,
-	0x0800118d,
+	0x0800118a,
 	0x24a5ffff,
 	0x10c00007,
 	0x200b0001,


@@ 3554,7 3551,7 @@ ulong bootcode[]={
 	0x20020030,
 	0xa0220000,
 	0x24c6ffff,
-	0x080011d4,
+	0x080011d1,
 	0x24a50001,
 	0x18e00013,
 	0x00000027,


@@ 3574,7 3571,7 @@ ulong bootcode[]={
 	0x256b0001,
 	0xa0220000,
 	0x24e7ffff,
-	0x080011e5,
+	0x080011e2,
 	0x24a50001,
 	0x20010067,
 	0x11a10046,


@@ 3594,7 3591,7 @@ ulong bootcode[]={
 	0x8fa1009c,
 	0x2002ffff,
 	0xafa10008,
-	0x0c000feb,
+	0x0c000fe8,
 	0xafa2000c,
 	0x8fa20000,
 	0x23bd0090,


@@ 3646,7 3643,7 @@ ulong bootcode[]={
 	0x00000810,
 	0x24210030,
 	0xa0410000,
-	0x08001205,
+	0x08001202,
 	0x24a50001,
 	0x24a6ffff,
 	0x04c00006,


@@ 3666,11 3663,11 @@ ulong bootcode[]={
 	0x00000027,
 	0x10e6ffad,
 	0x00062825,
-	0x080011ff,
+	0x080011fc,
 	0x24a50001,
-	0x0800124a,
+	0x08001247,
 	0x24e7ffff,
-	0x08001242,
+	0x0800123f,
 	0x24c6ffff,
 	0x8fa1002c,
 	0x2002ffff,


@@ 3680,9 3677,9 @@ ulong bootcode[]={
 	0x000e3025,
 	0x8fa1002c,
 	0x200d0068,
-	0x080011c1,
+	0x080011be,
 	0x01416023,
-	0x08001155,
+	0x08001152,
 	0x254affff,
 	0x23bdffe4,
 	0xafbf0000,


@@ 3702,7 3699,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x20030065,
 	0xafa20014,
-	0x0c0010d2,
+	0x0c0010cf,
 	0xafa30018,
 	0x8fa20000,
 	0x00000027,


@@ 3726,7 3723,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x20030066,
 	0xafa20014,
-	0x0c0010d2,
+	0x0c0010cf,
 	0xafa30018,
 	0x8fa20000,
 	0x00000027,


@@ 3750,7 3747,7 @@ ulong bootcode[]={
 	0x8fa2002c,
 	0x20030067,
 	0xafa20014,
-	0x0c0010d2,
+	0x0c0010cf,
 	0xafa30018,
 	0x8fa20000,
 	0x00000027,


@@ 3763,7 3760,7 @@ ulong bootcode[]={
 	0x04610008,
 	0x00000027,
 	0x00030823,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0x8fa20000,
 	0x23bd0014,


@@ 3785,12 3782,12 @@ ulong bootcode[]={
 	0x00032043,
 	0xafa40010,
 	0x00641023,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa20004,
 	0xe7a10008,
 	0xe7a0000c,
 	0x8fa10010,
-	0x0c0012ad,
+	0x0c0012aa,
 	0xafa10004,
 	0xc7a30008,
 	0xc7a2000c,


@@ 3868,14 3865,14 @@ ulong bootcode[]={
 	0x45010008,
 	0x00000027,
 	0x2001ffff,
-	0x0c00140a,
+	0x0c001407,
 	0xafa10004,
 	0x8fa20000,
 	0x00000027,
 	0x00400008,
 	0x23bd0010,
 	0x20020001,
-	0x0c00140a,
+	0x0c001407,
 	0xafa20004,
 	0x8fa20000,
 	0x00000027,


@@ 3952,7 3949,7 @@ ulong bootcode[]={
 	0x8fa3000c,
 	0x00000027,
 	0x00610824,
-	0x0800135b,
+	0x08001358,
 	0xafa1000c,
 	0x23bdfffc,
 	0x8fa30010,


@@ 4064,7 4061,7 @@ ulong bootcode[]={
 	0x00000027,
 	0xa0c8ffff,
 	0x24c6ffff,
-	0x080013da,
+	0x080013d7,
 	0x24e7ffff,
 	0x23bdfff4,
 	0x3c017ff0,


@@ 4093,7 4090,7 @@ ulong bootcode[]={
 	0x00000825,
 	0xe7a50004,
 	0xe7a40008,
-	0x0c00141b,
+	0x0c001418,
 	0xafa0000c,
 	0x14200005,
 	0x00000027,


@@ 4170,6 4167,7 @@ ulong bootcode[]={
 	0x00000000,
 	0x00000000,
 	0x00000000,
+	0x00000000,
 	0x40240000,
 	0x00000000,
 	0x2a2a2a00,


@@ 4234,19 4232,19 @@ ulong bootcode[]={
 	0x00000000,
 	0x001fffff,
 	0x7fffffff,
-	0x00004114,
-	0x00004144,
-	0x0000418c,
-	0x000041dc,
-	0x000041ec,
-	0x0000421c,
-	0x0000426c,
-	0x000042b0,
-	0x000042c0,
-	0x00004310,
-	0x00004994,
-	0x000049f4,
-	0x00004a54,
+	0x00004108,
+	0x00004138,
+	0x00004180,
+	0x000041d0,
+	0x000041e0,
+	0x00004210,
+	0x00004260,
+	0x000042a4,
+	0x000042b4,
+	0x00004304,
+	0x00004988,
+	0x000049e8,
+	0x00004a48,
 	0x00000000,
 	0x00000000,
 	0x00000000,


@@ 4309,10 4307,6 @@ ulong bootcode[]={
 	0x6f6e7300,
 	0x23632f63,
 	0x6f6e7300,
-	0x626f6f74,
-	0x2e632073,
-	0x74617269,
-	0x6e670a00,
 	0x62697462,
 	0x6f6f7465,
 	0x73002f6d,


@@ 4501,6 4495,8 @@ ulong bootcode[]={
 	0x08000000,
 	0x00000000,
 	0x00000000,
-	0x0004658,
+	0x0004640,
+	0x,
+	0x0004640,
 	0x,
 };

@@ 8,6 8,7 @@
 
 /*
  * Boot first processor
+ *   - why is the processor number loaded from R0 ?????
  */
 TEXT	start(SB), $-4
 


@@ 58,6 59,7 @@ clrbss:
 
 /*
  * Take first processor into user mode
+ * 	- argument is stack pointer to user
  */
 
 TEXT	touser(SB), $-4


@@ 145,14 147,47 @@ TEXT	gotolabel(SB), $0
 	MOVW	4(R2), R29
 	RET
 
-TEXT	gotopc(SB), $0
+TEXT	gotopc(SB), $-4
 
-	MOVW	$0, R0
-	MOVW	0(FP), R2
+	MOVW	0(FP), R7		/* save arguments for later */
 	MOVW	_argc(SB), R4
 	MOVW	_argv(SB), R5
-	JAL	(R2)
-	RET			/* shouldn't get here */
+
+	MOVW	$WBFLUSH, R1		/* flush write buffer */
+	MOVW	0(R1), R1
+	NOOP
+
+	MOVW	$KSEG1, R3		/* change to uncached address space */
+	MOVW	$gotopc0(SB), R2
+	OR	R3, R2
+	JMP	(R2)
+TEXT gotopc0(SB), $-4
+
+	MOVW	$(SWC|ISC), R1		/* swap and isolate cache, stay splhi */
+	MOVW	R1, M(STATUS)
+	NOOP
+
+	MOVW	$gotopc1(SB), R2	/* change back to cached address space */
+	JMP	(R2)
+TEXT gotopc1(SB), $-4
+
+	MOVW	$KSEG0, R6		/* init loop variables */
+	MOVW	$(64*1024), R8
+_gotopc1:
+	MOVBU	R0, 0x00(R6)
+	SUB	$0x4, R8
+	ADD	$0x4, R6
+	BGTZ	R8, _gotopc1
+
+	MOVW	$gotopc2(SB), R2	/* change to uncached address space */
+	OR	R3, R2
+	JMP	(R2)
+TEXT gotopc2(SB), $-4
+
+	MOVW	R0, M(STATUS)		/* put caches back, still splhi */
+	NOOP
+
+	JMP	(R7)
 
 TEXT	puttlb(SB), $4
 


@@ 438,6 473,7 @@ TEXT	savefpregs(SB), $0
 	RET
 
 TEXT	restfpregs(SB), $0
+
 	MOVW	M(STATUS), R3
 	MOVW	0(FP), R1
 	OR	$CU1, R3


@@ 465,3 501,98 @@ TEXT	restfpregs(SB), $0
 	AND	$~CU1, R3
 	MOVW	R3, M(STATUS)
 	RET
+
+
+TEXT icflush(SB), $-4			/* icflush(physaddr, nbytes) */
+
+	MOVW	M(STATUS), R6
+	MOVW	0(FP), R4
+	MOVW	4(FP), R5
+	MOVW	$KSEG0, R3
+	OR	R3, R4
+	MOVW	$0, M(STATUS)
+	MOVW	$WBFLUSH, R1		/* wbflush */
+	MOVW	0(R1), R1
+	NOOP
+	MOVW	$KSEG1, R3
+	MOVW	$icflush0(SB), R2	/* make sure PC is in uncached address space */
+	MOVW	$(SWC|ISC), R1
+	OR	R3, R2
+	JMP	(R2)
+
+TEXT icflush0(SB), $-4
+
+	MOVW	R1, M(STATUS)		/* swap and isolate cache, splhi */
+	MOVW	$icflush1(SB), R2
+	JMP	(R2)
+
+TEXT icflush1(SB), $-4
+
+_icflush1:
+	MOVBU	R0, 0x00(R4)
+	MOVBU	R0, 0x04(R4)
+	MOVBU	R0, 0x08(R4)
+	MOVBU	R0, 0x0C(R4)
+	MOVBU	R0, 0x10(R4)
+	MOVBU	R0, 0x14(R4)
+	MOVBU	R0, 0x18(R4)
+	MOVBU	R0, 0x1C(R4)
+	MOVBU	R0, 0x20(R4)
+	MOVBU	R0, 0x24(R4)
+	MOVBU	R0, 0x28(R4)
+	MOVBU	R0, 0x2C(R4)
+	MOVBU	R0, 0x30(R4)
+	MOVBU	R0, 0x34(R4)
+	MOVBU	R0, 0x38(R4)
+	MOVBU	R0, 0x3C(R4)
+	SUB	$0x40, R5
+	ADD	$0x40, R4
+	BGTZ	R5, _icflush1
+	MOVW	$icflush2(SB), R2	/* make sure PC is in uncached address space */
+	OR	R3, R2
+	JMP	(R2)
+
+TEXT icflush2(SB), $-4
+
+	MOVW	$0, M(STATUS)		/* swap back caches, de-isolate them, and stay splhi */
+	NOOP				/* +++ */
+	MOVW	R6, M(STATUS)
+	RET
+
+TEXT dcflush(SB), $-4			/* dcflush(physaddr, nbytes) */
+
+	MOVW	M(STATUS), R6
+	MOVW	0(FP), R4
+	MOVW	4(FP), R5
+	MOVW	$KSEG0, R3
+	OR	R3, R4
+	MOVW	$0, M(STATUS)
+	MOVW	$WBFLUSH, R1
+	MOVW	0(R1), R1
+	NOOP
+	MOVW	$ISC, R1
+	MOVW	R1, M(STATUS)
+_dcflush0:
+	MOVBU	R0, 0x00(R4)
+	MOVBU	R0, 0x04(R4)
+	MOVBU	R0, 0x08(R4)
+	MOVBU	R0, 0x0C(R4)
+	MOVBU	R0, 0x10(R4)
+	MOVBU	R0, 0x14(R4)
+	MOVBU	R0, 0x18(R4)
+	MOVBU	R0, 0x1C(R4)
+	MOVBU	R0, 0x20(R4)
+	MOVBU	R0, 0x24(R4)
+	MOVBU	R0, 0x28(R4)
+	MOVBU	R0, 0x2C(R4)
+	MOVBU	R0, 0x30(R4)
+	MOVBU	R0, 0x34(R4)
+	MOVBU	R0, 0x38(R4)
+	MOVBU	R0, 0x3C(R4)
+	SUB	$0x40, R5
+	ADD	$0x40, R4
+	BGTZ	R5, _dcflush0
+	MOVW	$0, M(STATUS)
+	NOOP				/* +++ */
+	MOVW	R6, M(STATUS)
+	RET

@@ 418,7 418,7 @@ Conf	conf;
 void
 confinit(void)
 {
-	long x, i, j, *l;
+	long x, i, j, *l, *e;
 
 #include  "conf.h"
 


@@ 439,4 439,11 @@ confinit(void)
 	conf.npte = 4 * conf.npage;
 	conf.nqueue = 5 * conf.nstream;
 	conf.nblock = 16 * conf.nstream;
+
+	/*
+	 *  zero memory from bss up
+	 */
+	e = (long *)(i*1024*1024);
+	for(l = &end; l < e; l++)
+		*l = 0;
 }