diff --git a/tools/boot/etch/boot-alpha.calc b/tools/boot/etch/boot-alpha.calc
index 03f95d3d..ad55f7e1 100644
--- a/tools/boot/etch/boot-alpha.calc
+++ b/tools/boot/etch/boot-alpha.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=25
+BOOT_SIZE_1=27
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -8,7 +8,9 @@ BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
 BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2
diff --git a/tools/boot/etch/boot-amd64.calc b/tools/boot/etch/boot-amd64.calc
index 89f2d7d7..f97c84a4 100644
--- a/tools/boot/etch/boot-amd64.calc
+++ b/tools/boot/etch/boot-amd64.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=9
+BOOT_SIZE_1=20
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -7,7 +7,11 @@ BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
+BOOT_SIZE_21=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2
diff --git a/tools/boot/etch/boot-arm.calc b/tools/boot/etch/boot-arm.calc
index 1d6357aa..76b52e0e 100644
--- a/tools/boot/etch/boot-arm.calc
+++ b/tools/boot/etch/boot-arm.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=26
+BOOT_SIZE_1=25
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -6,6 +6,9 @@ BOOT_SIZE_13=2
 BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
+BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-hppa.calc b/tools/boot/etch/boot-hppa.calc
index e124683a..b85e913c 100644
--- a/tools/boot/etch/boot-hppa.calc
+++ b/tools/boot/etch/boot-hppa.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=32
+BOOT_SIZE_1=35
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -8,7 +8,9 @@ BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
 BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2
diff --git a/tools/boot/etch/boot-i386.calc b/tools/boot/etch/boot-i386.calc
index 68dd93d6..e3841025 100644
--- a/tools/boot/etch/boot-i386.calc
+++ b/tools/boot/etch/boot-i386.calc
@@ -1,3 +1,21 @@
-BOOT_SIZE_1=44
-BOOT_SIZE_2=4
+BOOT_SIZE_1=40
+BOOT_SIZE_10=2
+BOOT_SIZE_11=2
+BOOT_SIZE_12=2
+BOOT_SIZE_13=2
+BOOT_SIZE_14=2
+BOOT_SIZE_15=2
+BOOT_SIZE_16=2
+BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
+BOOT_SIZE_2=2
+BOOT_SIZE_20=2
+BOOT_SIZE_21=2
 BOOT_SIZE_3=2
+BOOT_SIZE_4=2
+BOOT_SIZE_5=2
+BOOT_SIZE_6=2
+BOOT_SIZE_7=2
+BOOT_SIZE_8=2
+BOOT_SIZE_9=2
diff --git a/tools/boot/etch/boot-ia64.calc b/tools/boot/etch/boot-ia64.calc
index 47859822..9245c6b7 100644
--- a/tools/boot/etch/boot-ia64.calc
+++ b/tools/boot/etch/boot-ia64.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=52
+BOOT_SIZE_1=54
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -10,6 +10,9 @@ BOOT_SIZE_17=2
 BOOT_SIZE_18=2
 BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
+BOOT_SIZE_21=2
+BOOT_SIZE_22=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2
diff --git a/tools/boot/etch/boot-m68k.calc b/tools/boot/etch/boot-m68k.calc
index 76462c53..514dab58 100644
--- a/tools/boot/etch/boot-m68k.calc
+++ b/tools/boot/etch/boot-m68k.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=42
+BOOT_SIZE_1=46
 SIZE_MULT_1=97
 BOOT_SIZE_10=2
 SIZE_MULT_10=97
@@ -14,6 +14,10 @@ BOOT_SIZE_15=2
 SIZE_MULT_15=97
 BOOT_SIZE_16=2
 SIZE_MULT_16=97
+BOOT_SIZE_17=2
+SIZE_MULT_17=97
+BOOT_SIZE_18=2
+SIZE_MULT_18=97
 BOOT_SIZE_2=2
 SIZE_MULT_2=97
 BOOT_SIZE_3=2
diff --git a/tools/boot/etch/boot-mips.calc b/tools/boot/etch/boot-mips.calc
index 13b5d42f..38780f98 100644
--- a/tools/boot/etch/boot-mips.calc
+++ b/tools/boot/etch/boot-mips.calc
@@ -7,6 +7,8 @@ BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-mipsel.calc b/tools/boot/etch/boot-mipsel.calc
index ab0a1ea0..59c0ca03 100644
--- a/tools/boot/etch/boot-mipsel.calc
+++ b/tools/boot/etch/boot-mipsel.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=28
+BOOT_SIZE_1=31
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -7,6 +7,8 @@ BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-powerpc.calc b/tools/boot/etch/boot-powerpc.calc
index 93e5d4b5..fbd69497 100644
--- a/tools/boot/etch/boot-powerpc.calc
+++ b/tools/boot/etch/boot-powerpc.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=57
+BOOT_SIZE_1=52
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -8,7 +8,10 @@ BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
 BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
+BOOT_SIZE_21=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2
diff --git a/tools/boot/etch/boot-s390.calc b/tools/boot/etch/boot-s390.calc
index 1762d57a..1ca4c171 100644
--- a/tools/boot/etch/boot-s390.calc
+++ b/tools/boot/etch/boot-s390.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=29
+BOOT_SIZE_1=27
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -7,6 +7,8 @@ BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-sparc.calc b/tools/boot/etch/boot-sparc.calc
index 15cd8562..02c1a5fd 100644
--- a/tools/boot/etch/boot-sparc.calc
+++ b/tools/boot/etch/boot-sparc.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=33
+BOOT_SIZE_1=30
 BOOT_SIZE_10=2
 BOOT_SIZE_11=2
 BOOT_SIZE_12=2
@@ -7,7 +7,10 @@ BOOT_SIZE_14=2
 BOOT_SIZE_15=2
 BOOT_SIZE_16=2
 BOOT_SIZE_17=2
+BOOT_SIZE_18=2
+BOOT_SIZE_19=2
 BOOT_SIZE_2=2
+BOOT_SIZE_20=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
 BOOT_SIZE_5=2