diff --git a/tools/boot/etch/boot-alpha.calc b/tools/boot/etch/boot-alpha.calc
index 09ceec93..03f95d3d 100644
--- a/tools/boot/etch/boot-alpha.calc
+++ b/tools/boot/etch/boot-alpha.calc
@@ -1,8 +1,13 @@
-BOOT_SIZE_1=11
+BOOT_SIZE_1=25
 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_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-amd64.calc b/tools/boot/etch/boot-amd64.calc
index 30452b47..89f2d7d7 100644
--- a/tools/boot/etch/boot-amd64.calc
+++ b/tools/boot/etch/boot-amd64.calc
@@ -5,6 +5,8 @@ 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_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-arm.calc b/tools/boot/etch/boot-arm.calc
index 211d6845..1d6357aa 100644
--- a/tools/boot/etch/boot-arm.calc
+++ b/tools/boot/etch/boot-arm.calc
@@ -1,7 +1,11 @@
-BOOT_SIZE_1=17
+BOOT_SIZE_1=26
 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_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 c0276833..e124683a 100644
--- a/tools/boot/etch/boot-hppa.calc
+++ b/tools/boot/etch/boot-hppa.calc
@@ -1,8 +1,13 @@
-BOOT_SIZE_1=18
+BOOT_SIZE_1=32
 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_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-i386.calc b/tools/boot/etch/boot-i386.calc
index f33ae8fa..68dd93d6 100644
--- a/tools/boot/etch/boot-i386.calc
+++ b/tools/boot/etch/boot-i386.calc
@@ -1,14 +1,3 @@
-BOOT_SIZE_1=26
-BOOT_SIZE_10=2
-BOOT_SIZE_11=2
-BOOT_SIZE_12=2
-BOOT_SIZE_13=2
-BOOT_SIZE_14=2
+BOOT_SIZE_1=44
 BOOT_SIZE_2=4
 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 4a786942..47859822 100644
--- a/tools/boot/etch/boot-ia64.calc
+++ b/tools/boot/etch/boot-ia64.calc
@@ -1,9 +1,14 @@
-BOOT_SIZE_1=39
+BOOT_SIZE_1=52
 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_3=2
 BOOT_SIZE_4=2
diff --git a/tools/boot/etch/boot-m68k.calc b/tools/boot/etch/boot-m68k.calc
index cc631ccf..76462c53 100644
--- a/tools/boot/etch/boot-m68k.calc
+++ b/tools/boot/etch/boot-m68k.calc
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=29
+BOOT_SIZE_1=42
 SIZE_MULT_1=97
 BOOT_SIZE_10=2
 SIZE_MULT_10=97
@@ -6,6 +6,14 @@ BOOT_SIZE_11=2
 SIZE_MULT_11=97
 BOOT_SIZE_12=2
 SIZE_MULT_12=97
+BOOT_SIZE_13=2
+SIZE_MULT_13=97
+BOOT_SIZE_14=2
+SIZE_MULT_14=97
+BOOT_SIZE_15=2
+SIZE_MULT_15=97
+BOOT_SIZE_16=2
+SIZE_MULT_16=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 664e4baf..13b5d42f 100644
--- a/tools/boot/etch/boot-mips.calc
+++ b/tools/boot/etch/boot-mips.calc
@@ -1,7 +1,12 @@
-BOOT_SIZE_1=15
+BOOT_SIZE_1=13
 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_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 0f1ee707..ab0a1ea0 100644
--- a/tools/boot/etch/boot-mipsel.calc
+++ b/tools/boot/etch/boot-mipsel.calc
@@ -1,7 +1,12 @@
-BOOT_SIZE_1=14
+BOOT_SIZE_1=28
 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_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 8ac5fc0c..93e5d4b5 100644
--- a/tools/boot/etch/boot-powerpc.calc
+++ b/tools/boot/etch/boot-powerpc.calc
@@ -1,9 +1,13 @@
-BOOT_SIZE_1=81
+BOOT_SIZE_1=57
 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_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2
@@ -12,4 +16,4 @@ BOOT_SIZE_6=2
 BOOT_SIZE_7=2
 BOOT_SIZE_8=2
 BOOT_SIZE_9=2
-SIZE_MULT_1=93
+SIZE_MULT_1=96
diff --git a/tools/boot/etch/boot-s390.calc b/tools/boot/etch/boot-s390.calc
index aa3d67e3..1762d57a 100644
--- a/tools/boot/etch/boot-s390.calc
+++ b/tools/boot/etch/boot-s390.calc
@@ -1,8 +1,12 @@
-BOOT_SIZE_1=7
+BOOT_SIZE_1=29
 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_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 758258a9..15cd8562 100644
--- a/tools/boot/etch/boot-sparc.calc
+++ b/tools/boot/etch/boot-sparc.calc
@@ -1,8 +1,12 @@
-BOOT_SIZE_1=13
+BOOT_SIZE_1=33
 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_2=2
 BOOT_SIZE_3=2
 BOOT_SIZE_4=2