From b6f7cf957c58ea0efec6ad7df5f0c43ee79ac594 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 20 Mar 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-03-20

---
 port/devdup.c    |   2 +
 port/devnonet.c  |  15 +--
 port/stnoether.c |   2 +-
 port/stream.c    |   5 +-
 power/boot.h     | 290 ++++++++++++++++++++++++-----------------------
 5 files changed, 161 insertions(+), 153 deletions(-)

diff --git a/port/devdup.c b/port/devdup.c
index f61cff504bead881ec0c02e57c35c9ac9f3c27a0..e819bf879284f0e2034d16f085a6835c9a1403e3 100644
--- a/port/devdup.c
+++ b/port/devdup.c
@@ -75,6 +75,8 @@ dupopen(Chan *c, int omode)
 	f = u->fd[c->qid.path];
 	close(c);
 	incref(f);
+	if(omode & OCEXEC)
+		f->flag |= CCEXEC;
 	return f;
 }
 
diff --git a/port/devnonet.c b/port/devnonet.c
index 47c08877f285f7d6197fb0df3ae95d6f8df9eee2..fdd5b4e7b1cf389382d55f8d539efde64da4c584 100644
--- a/port/devnonet.c
+++ b/port/devnonet.c
@@ -443,12 +443,7 @@ noopen(Queue *q, Stream *s)
 	RD(q)->ptr = WR(q)->ptr = (void *)cp;
 }
 
-/*
- *  wait until a hangup is received.
- *  then send a hangup message (until one is received).
- *
- *	State Transitions:	* -> Cclosed
- */
+
 static int
 ishungup(void *a)
 {
@@ -463,6 +458,12 @@ ishungup(void *a)
 	}
 	return 0;
 }
+/*
+ *  wait until a hangup is received.
+ *  then send a hangup message (until one is received).
+ *
+ *	State Transitions:	* -> Cclosed
+ */
 static void
 noclose(Queue *q)
 {
@@ -1147,7 +1148,7 @@ nonetrcvmsg(Noconv *cp, Block *bp)
 	 *  if a new call request comes in on a connected channel, hang up the call
 	 */
 	if((f&NO_NEWCALL) && cp->state==Cconnected){
-		DPRINT("new call on connected channel\n"); 
+		print("new call on connected channel\n"); 
 		freeb(bp);
 		noreset(cp);
 		return;
diff --git a/port/stnoether.c b/port/stnoether.c
index 62f0875b42544c2e784cc58547ff1fe49c9e6fac..875c18001875978803f69a2ddb316e3c71240a50 100644
--- a/port/stnoether.c
+++ b/port/stnoether.c
@@ -193,7 +193,7 @@ noetheriput(Queue *q, Block *bp)
 	circuit = (h->circuit[2]<<16) | (h->circuit[1]<<8) | h->circuit[0];
 	s = (h->sum[1]<<8) | h->sum[0];
 	if(s && s!=nonetcksum(bp, 14)){
-/*		print("checksum error %ux %ux\n", s, (h->sum[1]<<8) | h->sum[0]); /**/
+		print("checksum error %ux %ux\n", s, (h->sum[1]<<8) | h->sum[0]); /**/
 		freeb(bp);
 		return;
 	}
diff --git a/port/stream.c b/port/stream.c
index 55c39668e8b5995ff6869f2d73186586158e6269..102e92058748751bae0167976ef2422db6717e90 100644
--- a/port/stream.c
+++ b/port/stream.c
@@ -1378,8 +1378,9 @@ dumpqueues(void)
 		qcount++;
 		print("%s %ux  R n %d l %d f %ux r %ux", q->info->name, q, q->nb,
 			q->len, q->flag, &(q->r));
-		print("  W n %d l %d f %ux r %ux\n", WR(q)->nb, WR(q)->len, WR(q)->flag,
-			&(WR(q)->r));
+		print("  W n %d l %d f %ux r %ux next %lux put %lux Rz %lux\n", 
+			WR(q)->nb, WR(q)->len,
+			WR(q)->flag, &(WR(q)->r), q->next, q->put, q->rp);
 		dumpblocks(q, 'R');
 		dumpblocks(WR(q), 'W');
 	}
diff --git a/power/boot.h b/power/boot.h
index 21f48f57ea40d1e67481373567f201052a561cf1..852b33d65a6d500ec26c630400df56446775b807 100644
--- a/power/boot.h
+++ b/power/boot.h
@@ -1,6 +1,6 @@
 ulong bootcode[]={
 	0x000000407,
-	0x0000051b8,
+	0x0000051d0,
 	0x000000748,
 	0x000001190,
 	0x000000000,
@@ -1576,7 +1576,7 @@ ulong bootcode[]={
 	0x08fa20010,
 	0x000000027,
 	0x0afa20004,
-	0x00c00174e,
+	0x00c001753,
 	0x0afa00008,
 	0x08fa30010,
 	0x08fa20000,
@@ -1760,7 +1760,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030040,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1786,7 +1786,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1797,7 +1797,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420024,
 	0x0afa20008,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1808,7 +1808,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420040,
 	0x0afa20008,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1937,7 +1937,7 @@ ulong bootcode[]={
 	0x024a3000e,
 	0x0afa30008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2084,7 +2084,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa70018,
 	0x08fa20010,
@@ -2160,7 +2160,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2304,7 +2304,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2430,7 +2430,7 @@ ulong bootcode[]={
 	0x024a30008,
 	0x0afa30008,
 	0x020020074,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2486,7 +2486,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030074,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2532,7 +2532,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2569,7 +2569,7 @@ ulong bootcode[]={
 	0x08fa30018,
 	0x000000027,
 	0x0afa30008,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2580,7 +2580,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x02463001c,
 	0x0afa30008,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2591,7 +2591,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024630038,
 	0x0afa30008,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa40018,
 	0x08fa30010,
@@ -2812,7 +2812,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020040,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -2830,7 +2830,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2840,7 +2840,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2850,7 +2850,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -2951,7 +2951,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -3074,7 +3074,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa6001c,
 	0x08fa30010,
@@ -3337,7 +3337,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -3373,7 +3373,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -3410,7 +3410,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa2000c,
 	0x08fa30010,
 	0x008000ed5,
@@ -3433,7 +3433,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3443,7 +3443,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3453,7 +3453,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001807,
+	0x00c00180c,
 	0x0afa3000c,
 	0x08fa5001c,
 	0x08fa20010,
@@ -3818,7 +3818,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40008,
 	0x08fa2001c,
-	0x00c0013cb,
+	0x00c0013cd,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
@@ -3835,31 +3835,33 @@ ulong bootcode[]={
 	0x08fa80014,
 	0x08fa70068,
 	0x000007025,
-	0x02522ff91,
-	0x01c4000c2,
+	0x02002006f,
+	0x00049202a,
+	0x0148000c3,
 	0x023ab0038,
-	0x0104000be,
+	0x0112200bf,
 	0x000000027,
-	0x039220058,
-	0x0104000b8,
+	0x020020058,
+	0x0112200b9,
 	0x000000027,
-	0x039220064,
-	0x0104000b3,
+	0x020020064,
+	0x0112200b4,
 	0x000000027,
 	0x030e30078,
-	0x02462ffd8,
-	0x01c400099,
+	0x020020028,
+	0x00043202a,
+	0x014800099,
 	0x000006825,
-	0x010400093,
+	0x010620093,
 	0x000000027,
-	0x038620008,
-	0x01040008c,
+	0x020020008,
+	0x01062008c,
 	0x000000027,
-	0x038620010,
-	0x01040007d,
+	0x020020010,
+	0x01062007d,
 	0x000000027,
-	0x038620020,
-	0x010400076,
+	0x020020020,
+	0x010620076,
 	0x000000027,
 	0x08caa0000,
 	0x020020004,
@@ -3933,12 +3935,12 @@ ulong bootcode[]={
 	0x024a5ffff,
 	0x001651021,
 	0x020040030,
-	0x00800133f,
+	0x008001341,
 	0x0a0440000,
 	0x024a5ffff,
 	0x001651021,
 	0x020040078,
-	0x00800135b,
+	0x00800135d,
 	0x0a0440000,
 	0x030e30040,
 	0x01060001e,
@@ -3960,27 +3962,27 @@ ulong bootcode[]={
 	0x000000027,
 	0x01d000003,
 	0x000000027,
-	0x008001330,
+	0x008001332,
 	0x000000027,
 	0x01d400003,
 	0x000000027,
-	0x008001330,
+	0x008001332,
 	0x000000027,
 	0x030e30040,
 	0x01460ffa1,
 	0x024a5ffff,
 	0x00149001b,
-	0x008001326,
+	0x008001328,
 	0x000003010,
 	0x00149001b,
-	0x00800136c,
+	0x00800136e,
 	0x000005012,
 	0x0200d0001,
-	0x00800131e,
+	0x008001320,
 	0x0000a5023,
 	0x08caa0000,
 	0x020020004,
-	0x008001319,
+	0x00800131b,
 	0x0afa20028,
 	0x08ca30000,
 	0x000000027,
@@ -3992,27 +3994,27 @@ ulong bootcode[]={
 	0x000021403,
 	0x020030004,
 	0x0afa30028,
-	0x008001319,
+	0x00800131b,
 	0x000025025,
 	0x08caa0000,
 	0x020020004,
-	0x008001319,
+	0x00800131b,
 	0x0afa20028,
 	0x08caa0000,
 	0x020020004,
-	0x008001319,
+	0x00800131b,
 	0x0afa20028,
-	0x038620030,
-	0x01040000a,
+	0x020020030,
+	0x01062000a,
 	0x000000027,
-	0x038620048,
-	0x010400003,
+	0x020020048,
+	0x010620003,
 	0x000000027,
-	0x008001316,
+	0x008001318,
 	0x000000027,
 	0x08ca80000,
 	0x020020004,
-	0x008001319,
+	0x00800131b,
 	0x0afa20028,
 	0x08ca20000,
 	0x000000027,
@@ -4022,25 +4024,25 @@ ulong bootcode[]={
 	0x03063ffff,
 	0x020020004,
 	0x0afa20028,
-	0x008001319,
+	0x00800131b,
 	0x000035025,
-	0x008001307,
+	0x008001308,
 	0x02009000a,
 	0x0200e0001,
-	0x008001307,
+	0x008001308,
 	0x020090010,
-	0x008001307,
+	0x008001308,
 	0x020090008,
-	0x039220075,
-	0x010400006,
+	0x020020075,
+	0x011220006,
 	0x000000027,
-	0x039220078,
-	0x01040fff7,
+	0x020020078,
+	0x01122fff7,
 	0x000000027,
-	0x008001307,
+	0x008001308,
 	0x000000027,
 	0x02009000a,
-	0x008001307,
+	0x008001308,
 	0x034e70020,
 	0x023bdfff0,
 	0x0afbf0000,
@@ -4070,7 +4072,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x01ce00003,
 	0x000000027,
-	0x0080013db,
+	0x0080013dd,
 	0x000000027,
 	0x000c9202b,
 	0x010800005,
@@ -4088,7 +4090,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffe3,
 	0x000000027,
-	0x0080013db,
+	0x0080013dd,
 	0x024e7ffff,
 	0x020020009,
 	0x01562fff9,
@@ -4099,7 +4101,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffd8,
 	0x0afc880d6,
-	0x0080013db,
+	0x0080013dd,
 	0x024e7ffff,
 	0x02002fc18,
 	0x011420003,
@@ -4124,7 +4126,7 @@ ulong bootcode[]={
 	0x0a0640000,
 	0x025080001,
 	0x024a50001,
-	0x008001410,
+	0x008001412,
 	0x0afc880d6,
 	0x000aa202a,
 	0x01080ffba,
@@ -4139,7 +4141,7 @@ ulong bootcode[]={
 	0x0a0440000,
 	0x025080001,
 	0x024a50001,
-	0x00800141f,
+	0x008001421,
 	0x0afc880d6,
 	0x023bdffec,
 	0x0afbf0000,
@@ -4154,7 +4156,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x0afa00008,
 	0x02002fc18,
-	0x00c0013cb,
+	0x00c0013cd,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4172,7 +4174,7 @@ ulong bootcode[]={
 	0x08fa3001c,
 	0x02002fc18,
 	0x0afa30008,
-	0x00c0013cb,
+	0x00c0013cd,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4214,20 +4216,20 @@ ulong bootcode[]={
 	0x000000825,
 	0x023bdfffc,
 	0x08fa30018,
+	0x020020068,
+	0x00043202a,
+	0x01480001b,
 	0x000000027,
-	0x02462ff98,
-	0x01c40001b,
+	0x010620016,
 	0x000000027,
-	0x010400016,
+	0x020020023,
+	0x010620010,
 	0x000000027,
-	0x038620023,
-	0x010400010,
-	0x000000027,
-	0x03862002b,
-	0x01040000a,
+	0x02002002b,
+	0x01062000a,
 	0x000000027,
-	0x03862002d,
-	0x010400004,
+	0x02002002d,
+	0x010620004,
 	0x000000027,
 	0x023bd0004,
 	0x003e00008,
@@ -4244,11 +4246,11 @@ ulong bootcode[]={
 	0x023bd0004,
 	0x003e00008,
 	0x02001fff0,
-	0x03862006c,
-	0x01040000a,
+	0x02002006c,
+	0x01062000a,
 	0x000000027,
-	0x038620075,
-	0x010400004,
+	0x020020075,
+	0x010620004,
 	0x000000027,
 	0x023bd0004,
 	0x003e00008,
@@ -4302,7 +4304,7 @@ ulong bootcode[]={
 	0x0afa00014,
 	0x02003005a,
 	0x0006d202a,
-	0x01080020e,
+	0x010800211,
 	0x000000027,
 	0x0afa00034,
 	0x0c7a10048,
@@ -4310,14 +4312,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x04620c032,
 	0x000000027,
-	0x045010065,
+	0x045010066,
 	0x000000027,
 	0x0c7a10048,
 	0x0c7a0004c,
 	0x023a20034,
 	0x0e7a10004,
 	0x0e7a00008,
-	0x00c001780,
+	0x00c001785,
 	0x0afa2000c,
 	0x08fa20034,
 	0x04444f800,
@@ -4334,13 +4336,14 @@ ulong bootcode[]={
 	0x044021000,
 	0x000000027,
 	0x044c4f800,
+	0x000000027,
 	0x0afa20034,
 	0x08fa20034,
 	0x000000027,
 	0x000023043,
 	0x0afa60030,
 	0x000061023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x0c7a30048,
 	0x0c7a2004c,
@@ -4352,7 +4355,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4375,7 +4378,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4384,7 +4387,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x00800150c,
+	0x00800150f,
 	0x023ae0078,
 	0x0c7c180da,
 	0x0c7c080de,
@@ -4401,7 +4404,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4410,7 +4413,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x008001523,
+	0x008001526,
 	0x023ae0078,
 	0x02003fc18,
 	0x015830002,
@@ -4419,7 +4422,7 @@ ulong bootcode[]={
 	0x020020067,
 	0x015a20003,
 	0x000000027,
-	0x01d800197,
+	0x01d800199,
 	0x000000027,
 	0x02002001e,
 	0x0004c202a,
@@ -4445,7 +4448,7 @@ ulong bootcode[]={
 	0x0200cffff,
 	0x0afac00ac,
 	0x0200d0065,
-	0x0080014d1,
+	0x0080014d3,
 	0x0afad00b4,
 	0x0c7a70048,
 	0x0c7a6004c,
@@ -4459,7 +4462,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x02002ffff,
 	0x000431023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4474,14 +4477,14 @@ ulong bootcode[]={
 	0x0e7a60044,
 	0x000003825,
 	0x000e6202a,
-	0x010800034,
+	0x010800035,
 	0x000000027,
 	0x08fa30034,
 	0x000000027,
 	0x000671823,
-	0x004600137,
+	0x004600138,
 	0x0afa7002c,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa30004,
 	0x0c7a30040,
 	0x0c7a20044,
@@ -4490,7 +4493,7 @@ ulong bootcode[]={
 	0x046201083,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0016e3,
+	0x00c0016e8,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4508,6 +4511,7 @@ ulong bootcode[]={
 	0x044071000,
 	0x000000027,
 	0x044c4f800,
+	0x000000027,
 	0x044871000,
 	0x000000027,
 	0x0c7a50038,
@@ -4525,7 +4529,7 @@ ulong bootcode[]={
 	0x0a0440001,
 	0x025070001,
 	0x000e6202a,
-	0x01480ffce,
+	0x01480ffcd,
 	0x000000027,
 	0x020070005,
 	0x024c6ffff,
@@ -4551,7 +4555,7 @@ ulong bootcode[]={
 	0x000042603,
 	0x02484fff6,
 	0x0a0440001,
-	0x0080015b2,
+	0x0080015b6,
 	0x024c6ffff,
 	0x010e00007,
 	0x0200b0001,
@@ -4619,7 +4623,7 @@ ulong bootcode[]={
 	0x020030030,
 	0x0a0430000,
 	0x024e7ffff,
-	0x0080015fd,
+	0x008001601,
 	0x024c60001,
 	0x019000013,
 	0x000000027,
@@ -4639,7 +4643,7 @@ ulong bootcode[]={
 	0x0256b0001,
 	0x0a0430000,
 	0x02508ffff,
-	0x00800160e,
+	0x008001612,
 	0x024c60001,
 	0x08fa300b0,
 	0x000000027,
@@ -4724,19 +4728,19 @@ ulong bootcode[]={
 	0x000001810,
 	0x024630030,
 	0x0a0430000,
-	0x008001635,
+	0x008001639,
 	0x024c60001,
 	0x000061825,
 	0x001231021,
 	0x02003002b,
 	0x0a0430000,
-	0x008001656,
+	0x00800165a,
 	0x024c60001,
 	0x000061025,
 	0x001221821,
 	0x020020065,
 	0x0a0620000,
-	0x00800164c,
+	0x008001650,
 	0x024c60001,
 	0x020030067,
 	0x011a30006,
@@ -4744,7 +4748,7 @@ ulong bootcode[]={
 	0x020030068,
 	0x011a30003,
 	0x000000027,
-	0x00800162f,
+	0x008001633,
 	0x000000027,
 	0x024c7ffff,
 	0x004e00006,
@@ -4764,11 +4768,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01107ff93,
 	0x000073025,
-	0x00800162f,
+	0x008001633,
 	0x024c60001,
-	0x008001694,
+	0x008001698,
 	0x02508ffff,
-	0x00800168c,
+	0x008001690,
 	0x024e7ffff,
 	0x08fa30034,
 	0x02002ffff,
@@ -4778,7 +4782,7 @@ ulong bootcode[]={
 	0x000003825,
 	0x08fa30034,
 	0x0200d0068,
-	0x0080015ea,
+	0x0080015ee,
 	0x001835023,
 	0x08fa200b0,
 	0x000000027,
@@ -4789,7 +4793,7 @@ ulong bootcode[]={
 	0x001221821,
 	0x02002002b,
 	0x0a0620000,
-	0x0080015db,
+	0x0080015df,
 	0x024c60001,
 	0x0c7c380da,
 	0x0c7c280de,
@@ -4799,7 +4803,7 @@ ulong bootcode[]={
 	0x0e7a60044,
 	0x0e7a70004,
 	0x0e7a60008,
-	0x00c0016e3,
+	0x00c0016e8,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4817,6 +4821,7 @@ ulong bootcode[]={
 	0x044071000,
 	0x000000027,
 	0x044c4f800,
+	0x000000027,
 	0x044871000,
 	0x000000027,
 	0x0c7a50040,
@@ -4825,14 +4830,14 @@ ulong bootcode[]={
 	0x046222181,
 	0x0e7a70040,
 	0x0e7a60044,
-	0x0080015a9,
+	0x0080015ad,
 	0x000000027,
-	0x008001546,
+	0x008001549,
 	0x0258cffff,
 	0x020020001,
 	0x0afa20014,
 	0x025ad0020,
-	0x0080014d1,
+	0x0080014d3,
 	0x0afad00b4,
 	0x023bdffe8,
 	0x0afbf0000,
@@ -4849,7 +4854,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0017ce,
+	0x00c0017d3,
 	0x0afa2000c,
 	0x04620c032,
 	0x000000027,
@@ -4878,7 +4883,7 @@ ulong bootcode[]={
 	0x023a2001c,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0017ce,
+	0x00c0017d3,
 	0x0afa2000c,
 	0x0c7a1001c,
 	0x0c7a00020,
@@ -4894,7 +4899,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0016e3,
+	0x00c0016e8,
 	0x000000027,
 	0x08fa20000,
 	0x023bd000c,
@@ -4907,7 +4912,7 @@ ulong bootcode[]={
 	0x004810008,
 	0x000000027,
 	0x000041023,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0014,
@@ -4928,12 +4933,12 @@ ulong bootcode[]={
 	0x000042843,
 	0x0afa50010,
 	0x000851823,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa30004,
 	0x0e7a10008,
 	0x0e7a0000c,
 	0x08fa20010,
-	0x00c001725,
+	0x00c00172a,
 	0x0afa20004,
 	0x0c7a30008,
 	0x0c7a2000c,
@@ -5124,7 +5129,7 @@ ulong bootcode[]={
 	0x08fa4000c,
 	0x000000027,
 	0x000821024,
-	0x0080017ef,
+	0x0080017f4,
 	0x0afa2000c,
 	0x023bdfffc,
 	0x08fa30010,
@@ -5235,10 +5240,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x0a0c8ffff,
 	0x024c6ffff,
-	0x00800186e,
+	0x008001873,
 	0x024e7ffff,
 	0x000000000,
 	0x000000000,
+	0x000000000,
 	0x07072696e,
 	0x074206572,
 	0x0726f7273,
@@ -5336,13 +5342,13 @@ ulong bootcode[]={
 	0x000010000,
 	0x002000000,
 	0x000000000,
-	0x0000050b8,
-	0x0000051d4,
+	0x0000050c0,
+	0x0000051dc,
 	0x000004bcc,
-	0x0000052b0,
-	0x000005104,
-	0x00000514c,
-	0x00000519c,
+	0x0000052b8,
+	0x00000510c,
+	0x000005154,
+	0x0000051a4,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -5703,8 +5709,6 @@ ulong bootcode[]={
 	0x06f6f7400,
 	0x000000000,
 	0x000000000,
-	0x00005920,
-	0x0,
-	0x00005920,
+	0x00005938,
 	0x0,
 };