summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2015-11-03 17:02:25 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-11-05 02:21:52 +0100
commit24391321e8afe74063b1c4216732b66ad6d1ed36 (patch)
tree30192e5a8af65b02990dc3c4dc0e76a5805fff8b
parent5a1f3370ea61ef13e7f5ef703e39ed8a71f69700 (diff)
downloadcoreboot-24391321e8afe74063b1c4216732b66ad6d1ed36.tar.xz
mainboard: Remove last_boot NVRAM option
The last_boot NVRAM option was deprecated and removed in commit 3bfd7cc6. Remove the last_boot option from all affected mainboards to eliminate user confusion. Change-Id: I7e201b9cf21dfe5dda156785bad078524098626d Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/12316 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins)
-rw-r--r--src/mainboard/advansus/a785e-i/cmos.layout1
-rw-r--r--src/mainboard/amd/bettong/cmos.layout1
-rw-r--r--src/mainboard/amd/bimini_fam10/cmos.layout1
-rw-r--r--src/mainboard/amd/db800/cmos.layout1
-rw-r--r--src/mainboard/amd/dbm690t/cmos.layout1
-rw-r--r--src/mainboard/amd/dinar/cmos.layout1
-rw-r--r--src/mainboard/amd/inagua/cmos.layout1
-rw-r--r--src/mainboard/amd/lamar/cmos.layout1
-rw-r--r--src/mainboard/amd/mahogany/cmos.layout1
-rw-r--r--src/mainboard/amd/mahogany_fam10/cmos.layout1
-rw-r--r--src/mainboard/amd/norwich/cmos.layout1
-rw-r--r--src/mainboard/amd/olivehill/cmos.layout1
-rw-r--r--src/mainboard/amd/olivehillplus/cmos.layout1
-rw-r--r--src/mainboard/amd/parmer/cmos.layout1
-rw-r--r--src/mainboard/amd/persimmon/cmos.layout1
-rw-r--r--src/mainboard/amd/pistachio/cmos.layout1
-rw-r--r--src/mainboard/amd/rumba/cmos.layout1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/cmos.layout1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout1
-rw-r--r--src/mainboard/amd/south_station/cmos.layout1
-rw-r--r--src/mainboard/amd/thatcher/cmos.layout1
-rw-r--r--src/mainboard/amd/tilapia_fam10/cmos.layout1
-rw-r--r--src/mainboard/amd/torpedo/cmos.layout1
-rw-r--r--src/mainboard/amd/union_station/cmos.layout1
-rw-r--r--src/mainboard/apple/macbook21/cmos.default1
-rw-r--r--src/mainboard/apple/macbook21/cmos.layout1
-rw-r--r--src/mainboard/arima/hdama/cmos.layout1
-rw-r--r--src/mainboard/artecgroup/dbe61/cmos.layout1
-rw-r--r--src/mainboard/asrock/939a785gmh/cmos.layout1
-rw-r--r--src/mainboard/asrock/e350m1/cmos.layout1
-rw-r--r--src/mainboard/asrock/imb-a180/cmos.layout1
-rw-r--r--src/mainboard/asus/a8n_e/cmos.default1
-rw-r--r--src/mainboard/asus/a8n_e/cmos.layout1
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/cmos.layout1
-rw-r--r--src/mainboard/asus/a8v-e_se/cmos.layout1
-rw-r--r--src/mainboard/asus/dsbf/cmos.layout1
-rw-r--r--src/mainboard/asus/f2a85-m/cmos.layout1
-rw-r--r--src/mainboard/asus/f2a85-m_le/cmos.layout1
-rw-r--r--src/mainboard/asus/k8v-x/cmos.layout1
-rw-r--r--src/mainboard/asus/kfsn4-dre/cmos.layout1
-rw-r--r--src/mainboard/asus/kfsn4-dre_k8/cmos.layout1
-rw-r--r--src/mainboard/asus/kgpe-d16/cmos.layout1
-rw-r--r--src/mainboard/asus/m2n-e/cmos.layout1
-rw-r--r--src/mainboard/asus/m2v-mx_se/cmos.layout1
-rw-r--r--src/mainboard/asus/m2v/cmos.layout1
-rw-r--r--src/mainboard/asus/m4a78-em/cmos.layout1
-rw-r--r--src/mainboard/asus/m4a785-m/cmos.layout1
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.default1
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.layout1
-rw-r--r--src/mainboard/asus/m5a88-v/cmos.layout1
-rw-r--r--src/mainboard/asus/mew-vm/cmos.layout1
-rw-r--r--src/mainboard/avalue/eax-785e/cmos.layout1
-rw-r--r--src/mainboard/bachmann/ot200/cmos.default1
-rw-r--r--src/mainboard/bachmann/ot200/cmos.layout1
-rw-r--r--src/mainboard/bap/ode_e20XX/cmos.layout1
-rw-r--r--src/mainboard/bcom/winnetp680/cmos.layout1
-rw-r--r--src/mainboard/biostar/am1ml/cmos.layout1
-rw-r--r--src/mainboard/broadcom/blast/cmos.layout1
-rw-r--r--src/mainboard/digitallogic/adl855pc/cmos.layout1
-rw-r--r--src/mainboard/digitallogic/msm800sev/cmos.layout1
-rw-r--r--src/mainboard/emulation/qemu-i440fx/cmos.layout1
-rw-r--r--src/mainboard/getac/p470/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/cmos.default1
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3v/cmos.default1
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/m57sli/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ma785gm/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/cmos.layout1
-rw-r--r--src/mainboard/gigabyte/ma78gm/cmos.layout1
-rw-r--r--src/mainboard/gizmosphere/gizmo/cmos.layout1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/cmos.layout1
-rw-r--r--src/mainboard/google/auron/cmos.layout1
-rw-r--r--src/mainboard/google/bolt/cmos.layout1
-rw-r--r--src/mainboard/google/butterfly/cmos.default1
-rw-r--r--src/mainboard/google/butterfly/cmos.layout1
-rw-r--r--src/mainboard/google/chell/cmos.layout1
-rw-r--r--src/mainboard/google/cyan/cmos.layout1
-rw-r--r--src/mainboard/google/falco/cmos.layout1
-rw-r--r--src/mainboard/google/glados/cmos.layout1
-rw-r--r--src/mainboard/google/jecht/cmos.layout1
-rw-r--r--src/mainboard/google/lars/cmos.layout1
-rw-r--r--src/mainboard/google/link/cmos.layout1
-rw-r--r--src/mainboard/google/panther/cmos.layout1
-rw-r--r--src/mainboard/google/parrot/cmos.layout1
-rw-r--r--src/mainboard/google/peppy/cmos.layout1
-rw-r--r--src/mainboard/google/rambi/cmos.layout1
-rw-r--r--src/mainboard/google/samus/cmos.layout1
-rw-r--r--src/mainboard/google/slippy/cmos.layout1
-rw-r--r--src/mainboard/google/stout/cmos.default1
-rw-r--r--src/mainboard/google/stout/cmos.layout1
-rw-r--r--src/mainboard/hp/abm/cmos.layout1
-rw-r--r--src/mainboard/hp/dl145_g1/cmos.layout1
-rw-r--r--src/mainboard/hp/dl145_g3/cmos.layout1
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/cmos.layout1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/cmos.default1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/cmos.layout1
-rw-r--r--src/mainboard/ibase/mb899/cmos.layout1
-rw-r--r--src/mainboard/ibm/e325/cmos.layout1
-rw-r--r--src/mainboard/ibm/e326/cmos.layout1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/cmos.layout1
-rw-r--r--src/mainboard/intel/baskingridge/cmos.layout1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/cmos.layout1
-rw-r--r--src/mainboard/intel/cougar_canyon2/cmos.layout1
-rw-r--r--src/mainboard/intel/d945gclf/cmos.layout1
-rw-r--r--src/mainboard/intel/eagleheights/cmos.layout1
-rw-r--r--src/mainboard/intel/emeraldlake2/cmos.layout1
-rw-r--r--src/mainboard/intel/kunimitsu/cmos.layout1
-rw-r--r--src/mainboard/intel/minnowmax/cmos.layout1
-rw-r--r--src/mainboard/intel/mohonpeak/cmos.layout1
-rw-r--r--src/mainboard/intel/sklrvp/cmos.layout1
-rw-r--r--src/mainboard/intel/strago/cmos.layout1
-rw-r--r--src/mainboard/intel/wtm2/cmos.layout1
-rw-r--r--src/mainboard/iwave/iWRainbowG6/cmos.layout1
-rw-r--r--src/mainboard/iwill/dk8_htx/cmos.layout1
-rw-r--r--src/mainboard/iwill/dk8s2/cmos.layout1
-rw-r--r--src/mainboard/iwill/dk8x/cmos.layout1
-rw-r--r--src/mainboard/jetway/j7f2/cmos.layout1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/cmos.layout1
-rw-r--r--src/mainboard/jetway/pa78vm5/cmos.layout1
-rw-r--r--src/mainboard/kontron/986lcd-m/cmos.layout1
-rw-r--r--src/mainboard/kontron/kt690/cmos.layout1
-rw-r--r--src/mainboard/kontron/ktqm77/cmos.layout1
-rw-r--r--src/mainboard/lanner/em8510/cmos.layout1
-rw-r--r--src/mainboard/lenovo/g505s/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t400/cmos.default1
-rw-r--r--src/mainboard/lenovo/t400/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t420s/cmos.default1
-rw-r--r--src/mainboard/lenovo/t420s/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t430s/cmos.default1
-rw-r--r--src/mainboard/lenovo/t430s/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t520/cmos.default1
-rw-r--r--src/mainboard/lenovo/t520/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t530/cmos.default1
-rw-r--r--src/mainboard/lenovo/t530/cmos.layout1
-rw-r--r--src/mainboard/lenovo/t60/cmos.default1
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x200/cmos.default1
-rw-r--r--src/mainboard/lenovo/x200/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x201/cmos.default1
-rw-r--r--src/mainboard/lenovo/x201/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x220/cmos.default1
-rw-r--r--src/mainboard/lenovo/x220/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x230/cmos.default1
-rw-r--r--src/mainboard/lenovo/x230/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x60/cmos.default1
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout1
-rw-r--r--src/mainboard/lippert/frontrunner-af/cmos.layout1
-rw-r--r--src/mainboard/lippert/frontrunner/cmos.layout1
-rw-r--r--src/mainboard/lippert/toucan-af/cmos.layout1
-rw-r--r--src/mainboard/msi/ms7135/cmos.layout1
-rw-r--r--src/mainboard/msi/ms7260/cmos.layout1
-rw-r--r--src/mainboard/msi/ms9185/cmos.layout1
-rw-r--r--src/mainboard/msi/ms9282/cmos.layout1
-rw-r--r--src/mainboard/msi/ms9652_fam10/cmos.layout1
-rw-r--r--src/mainboard/newisys/khepri/cmos.layout1
-rw-r--r--src/mainboard/nvidia/l1_2pvv/cmos.layout1
-rw-r--r--src/mainboard/packardbell/ms2290/cmos.default1
-rw-r--r--src/mainboard/packardbell/ms2290/cmos.layout1
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.default1
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.layout1
-rw-r--r--src/mainboard/pcengines/alix2d/cmos.layout1
-rw-r--r--src/mainboard/pcengines/apu1/cmos.default1
-rw-r--r--src/mainboard/pcengines/apu1/cmos.layout3
-rw-r--r--src/mainboard/roda/rk886ex/cmos.layout1
-rw-r--r--src/mainboard/roda/rk9/cmos.layout1
-rw-r--r--src/mainboard/samsung/lumpy/cmos.layout1
-rw-r--r--src/mainboard/samsung/stumpy/cmos.layout1
-rw-r--r--src/mainboard/siemens/mc_tcu3/cmos.layout1
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/cmos.default1
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/cmos.layout1
-rw-r--r--src/mainboard/sunw/ultra40/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8dme/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8dmr/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8qgi/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8scm/cmos.layout1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/cmos.layout1
-rw-r--r--src/mainboard/supermicro/x7db8/cmos.layout1
-rw-r--r--src/mainboard/technexion/tim5690/cmos.layout1
-rw-r--r--src/mainboard/technexion/tim8690/cmos.layout1
-rw-r--r--src/mainboard/traverse/geos/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2735/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2850/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2875/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2880/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2881/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2882/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2885/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2891/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2892/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2895/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2912/cmos.layout1
-rw-r--r--src/mainboard/tyan/s2912_fam10/cmos.layout1
-rw-r--r--src/mainboard/tyan/s4880/cmos.layout1
-rw-r--r--src/mainboard/tyan/s4882/cmos.layout1
-rw-r--r--src/mainboard/tyan/s8226/cmos.layout1
-rw-r--r--src/mainboard/via/epia-cn/cmos.layout1
-rw-r--r--src/mainboard/via/epia-m700/cmos.layout1
-rw-r--r--src/mainboard/via/pc2500e/cmos.layout1
-rw-r--r--src/mainboard/via/vt8454c/cmos.layout1
-rw-r--r--src/mainboard/winent/mb6047/cmos.layout1
-rw-r--r--src/mainboard/winent/pl6064/cmos.layout1
-rw-r--r--src/mainboard/wyse/s50/cmos.layout1
206 files changed, 1 insertions, 207 deletions
diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/bettong/cmos.layout b/src/mainboard/amd/bettong/cmos.layout
index f5dd35015f..ba44a24625 100644
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -41,7 +41,6 @@ entries
#96 288 r 0 temporary_filler
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
386 1 e 1 ECC_memory
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/db800/cmos.layout b/src/mainboard/amd/db800/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index 25bad99e3c..4e9d62cffc 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/dinar/cmos.layout b/src/mainboard/amd/dinar/cmos.layout
index 1a25edd034..bf617ae067 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/lamar/cmos.layout b/src/mainboard/amd/lamar/cmos.layout
index 2cce75e786..9663cdbb90 100644
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index afd6aae54e..64832c1d53 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/norwich/cmos.layout b/src/mainboard/amd/norwich/cmos.layout
index 0bcfaf88d2..6a030e6674 100644
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/olivehillplus/cmos.layout b/src/mainboard/amd/olivehillplus/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index 25bad99e3c..4e9d62cffc 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/rumba/cmos.layout b/src/mainboard/amd/rumba/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 8eb06317fb..14e45ef914 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/tilapia_fam10/cmos.layout b/src/mainboard/amd/tilapia_fam10/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/torpedo/cmos.layout b/src/mainboard/amd/torpedo/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/apple/macbook21/cmos.default b/src/mainboard/apple/macbook21/cmos.default
index e0b992c578..37018a443f 100644
--- a/src/mainboard/apple/macbook21/cmos.default
+++ b/src/mainboard/apple/macbook21/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
hyper_threading=Enable
diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout
index e2b5a4ec15..c11997cff1 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 h 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/arima/hdama/cmos.layout b/src/mainboard/arima/hdama/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/arima/hdama/cmos.layout
+++ b/src/mainboard/arima/hdama/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index afd6aae54e..64832c1d53 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 6bc58ed17c..83de4da400 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/a8n_e/cmos.default b/src/mainboard/asus/a8n_e/cmos.default
index 933c804418..520f237946 100644
--- a/src/mainboard/asus/a8n_e/cmos.default
+++ b/src/mainboard/asus/a8n_e/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index 7cb0a8b0ca..90e3e94178 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -1,7 +1,6 @@
entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
- 385 1 e 4 last_boot
386 1 e 1 ECC_memory
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
index 5edb3e47be..7cf03696d4 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 5edb3e47be..7cf03696d4 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout
index a6328d1079..2bccce8d96 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/f2a85-m_le/cmos.layout b/src/mainboard/asus/f2a85-m_le/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/k8v-x/cmos.layout b/src/mainboard/asus/k8v-x/cmos.layout
index 5edb3e47be..7cf03696d4 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index 3c7fe4be52..66bc3a0728 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
index 95d291431f..9b26123d1a 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index c672e099cd..fbda5e0df1 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index 42b3b7d825..da602990cf 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index 23338a9703..b74079d58b 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m2v/cmos.layout b/src/mainboard/asus/m2v/cmos.layout
index 5edb3e47be..7cf03696d4 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m4a785t-m/cmos.default b/src/mainboard/asus/m4a785t-m/cmos.default
index 8ab4fe8c39..1686102078 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.default
+++ b/src/mainboard/asus/m4a785t-m/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
ECC_memory=Enable
baud_rate=115200
hw_scrubber=Enable
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/bachmann/ot200/cmos.default b/src/mainboard/bachmann/ot200/cmos.default
index 05eadbfb5f..0b685c9c10 100644
--- a/src/mainboard/bachmann/ot200/cmos.default
+++ b/src/mainboard/bachmann/ot200/cmos.default
@@ -1,4 +1,3 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout
index 9290489d58..a04213d085 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
# -----------------------------------------------------------------
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/bcom/winnetp680/cmos.layout b/src/mainboard/bcom/winnetp680/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index 503071e191..d29e4d2549 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -41,7 +41,6 @@ entries
#96 288 r 0 temporary_filler
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
386 1 e 1 ECC_memory
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/digitallogic/adl855pc/cmos.layout b/src/mainboard/digitallogic/adl855pc/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/digitallogic/adl855pc/cmos.layout
+++ b/src/mainboard/digitallogic/adl855pc/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout
index 80df7b6a48..023bdfacab 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
index 21d75e5ece..767372cd23 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index 3742cd289a..32a3059d71 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
index 21d75e5ece..767372cd23 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
index 3742cd289a..32a3059d71 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index dd40c56005..ea39ed60d4 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/bolt/cmos.layout b/src/mainboard/google/bolt/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/bolt/cmos.layout
+++ b/src/mainboard/google/bolt/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/butterfly/cmos.default b/src/mainboard/google/butterfly/cmos.default
index 77c7100f38..d6789ebdb8 100644
--- a/src/mainboard/google/butterfly/cmos.default
+++ b/src/mainboard/google/butterfly/cmos.default
@@ -1,5 +1,4 @@
boot_option = Fallback
-last_boot = Fallback
debug_level = Spew
nmi = Enable
power_on_after_fail = Enable
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index f9fd3a4231..8fe3d9b974 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout
index dc68607c48..69046e54df 100644
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index 601ead97bc..4d463a093c 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/falco/cmos.layout b/src/mainboard/google/falco/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/falco/cmos.layout
+++ b/src/mainboard/google/falco/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index dc68607c48..69046e54df 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index f862cd68b7..58a93c3560 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -64,7 +64,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout
index 59be84b241..84677478cc 100644
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index 76453afb2f..0513a5466e 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/panther/cmos.layout b/src/mainboard/google/panther/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/panther/cmos.layout
+++ b/src/mainboard/google/panther/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index 76453afb2f..0513a5466e 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/peppy/cmos.layout b/src/mainboard/google/peppy/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/peppy/cmos.layout
+++ b/src/mainboard/google/peppy/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/samus/cmos.layout b/src/mainboard/google/samus/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/samus/cmos.layout
+++ b/src/mainboard/google/samus/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/google/stout/cmos.default b/src/mainboard/google/stout/cmos.default
index 77c7100f38..d6789ebdb8 100644
--- a/src/mainboard/google/stout/cmos.default
+++ b/src/mainboard/google/stout/cmos.default
@@ -1,5 +1,4 @@
boot_option = Fallback
-last_boot = Fallback
debug_level = Spew
nmi = Enable
power_on_after_fail = Enable
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index 76453afb2f..0513a5466e 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/hp/dl145_g1/cmos.layout b/src/mainboard/hp/dl145_g1/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 9f0bd0e77c..73d53af3d5 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.default b/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
index 0bca0fc259..5031376282 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
@@ -1,5 +1,4 @@
boot_option = Fallback
-last_boot = Fallback
debug_level = Spew
nmi = Disable
power_on_after_fail = Disable
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
index eb0e6b63e8..5b1f9cb43b 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -5,7 +5,6 @@ entries
# RTC_BOOT_BYTE (coreboot hardcoded)
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
# southbridge/amd/agesa/hudson should use this but it doesn't
diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout
index 7e9d36c0d5..1ef43610f7 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/ibm/e325/cmos.layout b/src/mainboard/ibm/e325/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/ibm/e325/cmos.layout
+++ b/src/mainboard/ibm/e325/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/ibm/e326/cmos.layout b/src/mainboard/ibm/e326/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/ibm/e326/cmos.layout
+++ b/src/mainboard/ibm/e326/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index 64c5ec5d84..2f429c9a7a 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout
index 2df7fec357..bd5010c19b 100644
--- a/src/mainboard/intel/bayleybay_fsp/cmos.layout
+++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/cougar_canyon2/cmos.layout b/src/mainboard/intel/cougar_canyon2/cmos.layout
index 667d1640cf..44ce09658c 100644
--- a/src/mainboard/intel/cougar_canyon2/cmos.layout
+++ b/src/mainboard/intel/cougar_canyon2/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout
index 956d9fe1b3..31f2b20fa2 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout
index 10e74e2aa0..468e72385e 100644
--- a/src/mainboard/intel/eagleheights/cmos.layout
+++ b/src/mainboard/intel/eagleheights/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index e7f44ca2f6..ab8cdb81d2 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index 59be84b241..84677478cc 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout
index 2d25bcae51..8aaa522bb8 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout
index 8b7431e5e4..28976c1212 100644
--- a/src/mainboard/intel/mohonpeak/cmos.layout
+++ b/src/mainboard/intel/mohonpeak/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/sklrvp/cmos.layout b/src/mainboard/intel/sklrvp/cmos.layout
index 59be84b241..84677478cc 100644
--- a/src/mainboard/intel/sklrvp/cmos.layout
+++ b/src/mainboard/intel/sklrvp/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index 601ead97bc..4d463a093c 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -65,7 +65,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index 19677177db..2a518e9213 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/iwave/iWRainbowG6/cmos.layout b/src/mainboard/iwave/iWRainbowG6/cmos.layout
index d91a1838a3..0b1845eb43 100644
--- a/src/mainboard/iwave/iWRainbowG6/cmos.layout
+++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/iwill/dk8s2/cmos.layout b/src/mainboard/iwill/dk8s2/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/iwill/dk8s2/cmos.layout
+++ b/src/mainboard/iwill/dk8s2/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/iwill/dk8x/cmos.layout b/src/mainboard/iwill/dk8x/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/iwill/dk8x/cmos.layout
+++ b/src/mainboard/iwill/dk8x/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/jetway/j7f2/cmos.layout b/src/mainboard/jetway/j7f2/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/jetway/j7f2/cmos.layout
+++ b/src/mainboard/jetway/j7f2/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/jetway/pa78vm5/cmos.layout b/src/mainboard/jetway/pa78vm5/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout
index cd6e7ec40b..f9fb424a5e 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index 25bad99e3c..4e9d62cffc 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index 5915c8f1cd..9517618744 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/lanner/em8510/cmos.layout
+++ b/src/mainboard/lanner/em8510/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 66d17073a3..d83bb14d26 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/lenovo/t400/cmos.default b/src/mainboard/lenovo/t400/cmos.default
index 67b89209c9..ac9f96d73c 100644
--- a/src/mainboard/lenovo/t400/cmos.default
+++ b/src/mainboard/lenovo/t400/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Disable
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index 407b561b33..686fc25b7e 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -44,7 +44,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/t420s/cmos.default b/src/mainboard/lenovo/t420s/cmos.default
index cf017261e7..6f3f75de8b 100644
--- a/src/mainboard/lenovo/t420s/cmos.default
+++ b/src/mainboard/lenovo/t420s/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index 189ab11416..cb76e7064b 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default
index 137f48254b..99a0f1ac41 100644
--- a/src/mainboard/lenovo/t430s/cmos.default
+++ b/src/mainboard/lenovo/t430s/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index 1586a7d89d..0d3d089391 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/t520/cmos.default b/src/mainboard/lenovo/t520/cmos.default
index 137f48254b..99a0f1ac41 100644
--- a/src/mainboard/lenovo/t520/cmos.default
+++ b/src/mainboard/lenovo/t520/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 2dd5e78990..bd9fd2aeb4 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/t530/cmos.default b/src/mainboard/lenovo/t530/cmos.default
index 137f48254b..99a0f1ac41 100644
--- a/src/mainboard/lenovo/t530/cmos.default
+++ b/src/mainboard/lenovo/t530/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 2dd5e78990..bd9fd2aeb4 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/t60/cmos.default b/src/mainboard/lenovo/t60/cmos.default
index 6adf85d7ed..5dd0c707f5 100644
--- a/src/mainboard/lenovo/t60/cmos.default
+++ b/src/mainboard/lenovo/t60/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 76a4e37d86..29ea2efbf3 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/x200/cmos.default b/src/mainboard/lenovo/x200/cmos.default
index 67b89209c9..ac9f96d73c 100644
--- a/src/mainboard/lenovo/x200/cmos.default
+++ b/src/mainboard/lenovo/x200/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Disable
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 3eb085042a..5f50bd4941 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -44,7 +44,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default
index 29eb509e0b..710edfc1a7 100644
--- a/src/mainboard/lenovo/x201/cmos.default
+++ b/src/mainboard/lenovo/x201/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index 3c541b4297..d231a11578 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default
index ef3e9206d1..8038d64d8c 100644
--- a/src/mainboard/lenovo/x220/cmos.default
+++ b/src/mainboard/lenovo/x220/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index 9b224b6c59..8f147cc7e8 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/x230/cmos.default b/src/mainboard/lenovo/x230/cmos.default
index 137f48254b..99a0f1ac41 100644
--- a/src/mainboard/lenovo/x230/cmos.default
+++ b/src/mainboard/lenovo/x230/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 79b955b6b0..e8cd140ad5 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default
index 0185e94f64..3579757323 100644
--- a/src/mainboard/lenovo/x60/cmos.default
+++ b/src/mainboard/lenovo/x60/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
hyper_threading=Enable
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index ad1d626c40..e267bb5833 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 h 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/lippert/frontrunner/cmos.layout b/src/mainboard/lippert/frontrunner/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout
index c2d0a33403..34afb4218d 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index 70f28472bd..be9dce6a2a 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 30f40c3fa4..7e80285d8f 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 8eb06317fb..14e45ef914 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/newisys/khepri/cmos.layout b/src/mainboard/newisys/khepri/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/newisys/khepri/cmos.layout
+++ b/src/mainboard/newisys/khepri/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/packardbell/ms2290/cmos.default b/src/mainboard/packardbell/ms2290/cmos.default
index 5820bfa2b3..aef840c5f4 100644
--- a/src/mainboard/packardbell/ms2290/cmos.default
+++ b/src/mainboard/packardbell/ms2290/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
baud_rate=115200
debug_level=Spew
power_on_after_fail=Enable
diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout
index 6bfa5e5c88..4cfb902020 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/pcengines/alix1c/cmos.default b/src/mainboard/pcengines/alix1c/cmos.default
index 0e59b0901a..19b5ab749f 100644
--- a/src/mainboard/pcengines/alix1c/cmos.default
+++ b/src/mainboard/pcengines/alix1c/cmos.default
@@ -1,5 +1,4 @@
boot_option=Fallback
-last_boot=Fallback
ECC_memory=Disable
baud_rate=115200
power_on_after_fail=Disable
diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/pcengines/alix2d/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/pcengines/alix2d/cmos.layout
+++ b/src/mainboard/pcengines/alix2d/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/pcengines/apu1/cmos.default b/src/mainboard/pcengines/apu1/cmos.default
index 35e036538d..31d5a31405 100644
--- a/src/mainboard/pcengines/apu1/cmos.default
+++ b/src/mainboard/pcengines/apu1/cmos.default
@@ -1,4 +1,3 @@
-last_boot=Fallback
boot_option=Fallback
multi_core=Enable
debug_level=Spew
diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout
index 0cf145f258..e0501f620a 100644
--- a/src/mainboard/pcengines/apu1/cmos.layout
+++ b/src/mainboard/pcengines/apu1/cmos.layout
@@ -3,7 +3,6 @@ entries
# <start-bit> <bit-length> <config> <config-id> <parameter-name>
0 384 r 0 reserved_memory
384 4 r 0 reboot_bits
-388 1 e 2 last_boot
# leave 3 bits to make checksummed area start byte-aligned
392 1 e 2 boot_option
393 1 e 1 multi_core
@@ -18,7 +17,7 @@ enumerations
## for multi_core
1 0 Enable
1 1 Disable
-## for last_boot, boot_option
+## for boot_option
2 0 Fallback
2 1 Normal
## for baud_rate
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index 80df7b6a48..023bdfacab 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout
index 1cb641930d..f567b976d1 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -44,7 +44,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index 4fd3076ec2..b88ceb8803 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout
index 28c596d2b8..a5ed03072f 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -42,7 +42,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/siemens/mc_tcu3/cmos.layout b/src/mainboard/siemens/mc_tcu3/cmos.layout
index 9ff9d1f22b..6297de00fe 100644
--- a/src/mainboard/siemens/mc_tcu3/cmos.layout
+++ b/src/mainboard/siemens/mc_tcu3/cmos.layout
@@ -64,7 +64,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.default b/src/mainboard/siemens/sitemp_g1p1/cmos.default
index 5e47a19554..9f15a1cd5e 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.default
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.default
@@ -1,4 +1,3 @@
-last_boot=Fallback
boot_option=Fallback
baud_rate=115200
debug_level=Spew
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
index 1156bfc796..18c0a6f51e 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -28,7 +28,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
#386 2 r 1 unused
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 8eb06317fb..14e45ef914 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/supermicro/h8qgi/cmos.layout b/src/mainboard/supermicro/h8qgi/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 8eb06317fb..14e45ef914 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/supermicro/h8scm/cmos.layout b/src/mainboard/supermicro/h8scm/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/h8scm_fam10/cmos.layout b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
index f516f499e4..0ad18a254b 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/supermicro/x7db8/cmos.layout b/src/mainboard/supermicro/x7db8/cmos.layout
index a6328d1079..2bccce8d96 100644
--- a/src/mainboard/supermicro/x7db8/cmos.layout
+++ b/src/mainboard/supermicro/x7db8/cmos.layout
@@ -43,7 +43,6 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
#390 2 r 0 unused?
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index 25bad99e3c..4e9d62cffc 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index 25bad99e3c..4e9d62cffc 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/traverse/geos/cmos.layout b/src/mainboard/traverse/geos/cmos.layout
index 0bcfaf88d2..6a030e6674 100644
--- a/src/mainboard/traverse/geos/cmos.layout
+++ b/src/mainboard/traverse/geos/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/tyan/s2735/cmos.layout b/src/mainboard/tyan/s2735/cmos.layout
index 2c50002cef..fc3cdb267e 100644
--- a/src/mainboard/tyan/s2735/cmos.layout
+++ b/src/mainboard/tyan/s2735/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 2 hyper_threading
diff --git a/src/mainboard/tyan/s2850/cmos.layout b/src/mainboard/tyan/s2850/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2850/cmos.layout
+++ b/src/mainboard/tyan/s2850/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2875/cmos.layout b/src/mainboard/tyan/s2875/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2875/cmos.layout
+++ b/src/mainboard/tyan/s2875/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2880/cmos.layout b/src/mainboard/tyan/s2880/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2880/cmos.layout
+++ b/src/mainboard/tyan/s2880/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2881/cmos.layout b/src/mainboard/tyan/s2881/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2881/cmos.layout
+++ b/src/mainboard/tyan/s2881/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2882/cmos.layout b/src/mainboard/tyan/s2882/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2882/cmos.layout
+++ b/src/mainboard/tyan/s2882/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2885/cmos.layout b/src/mainboard/tyan/s2885/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2885/cmos.layout
+++ b/src/mainboard/tyan/s2885/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2891/cmos.layout b/src/mainboard/tyan/s2891/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2891/cmos.layout
+++ b/src/mainboard/tyan/s2891/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2892/cmos.layout b/src/mainboard/tyan/s2892/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2892/cmos.layout
+++ b/src/mainboard/tyan/s2892/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2895/cmos.layout b/src/mainboard/tyan/s2895/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s2895/cmos.layout
+++ b/src/mainboard/tyan/s2895/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index 23fd41368f..53f259ad5a 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -19,7 +19,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 8eb06317fb..14e45ef914 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
diff --git a/src/mainboard/tyan/s4880/cmos.layout b/src/mainboard/tyan/s4880/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s4880/cmos.layout
+++ b/src/mainboard/tyan/s4880/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s4882/cmos.layout b/src/mainboard/tyan/s4882/cmos.layout
index 85fa992792..4e081ea1aa 100644
--- a/src/mainboard/tyan/s4882/cmos.layout
+++ b/src/mainboard/tyan/s4882/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout
index f53ce6d872..f47185f896 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -18,7 +18,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/via/epia-cn/cmos.layout b/src/mainboard/via/epia-cn/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout
index d6b214f455..74f120d91e 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -19,7 +19,6 @@ entries
#start-bit length config config-ID name
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout
index 3856bb528d..dea018f960 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -17,7 +17,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
456 1 e 1 ECC_memory
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
diff --git a/src/mainboard/winent/mb6047/cmos.layout b/src/mainboard/winent/mb6047/cmos.layout
index affac0a2b4..1e4f30767a 100644
--- a/src/mainboard/winent/mb6047/cmos.layout
+++ b/src/mainboard/winent/mb6047/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
diff --git a/src/mainboard/winent/pl6064/cmos.layout b/src/mainboard/winent/pl6064/cmos.layout
index b31e20ca3f..6de5ab6d1b 100644
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -2,7 +2,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout
index affb25d03d..fffba2bd87 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -20,7 +20,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-385 1 e 4 last_boot
388 4 r 0 reboot_bits
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail