summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-11-03 00:03:32 +0100
committerAngel Pons <th3fanbus@gmail.com>2020-11-23 09:55:43 +0000
commit2c0aa00d6e562b2e6dbe580e188e24ce5e4336e2 (patch)
tree3e4f0749bda60dd17635765faf47541eb59a4b1c /src
parent447233ce8c25863c2236d0b208bff7f63cd738fb (diff)
downloadcoreboot-2c0aa00d6e562b2e6dbe580e188e24ce5e4336e2.tar.gz
coreboot-2c0aa00d6e562b2e6dbe580e188e24ce5e4336e2.tar.bz2
coreboot-2c0aa00d6e562b2e6dbe580e188e24ce5e4336e2.zip
mb/**/cmos.layout: Remove crusty comments
Most of these comments have been copy-pasted or serve no purpose other than to eventually turn into misleading info. While the description of the first 120 bits of CMOS could be useful, it should instead be added to the documentation for the CMOS option infrastructure, or /dev/null. Moreover, trim down newlines to no more than two consecutive newlines. Change-Id: I119b248821221e68c4e31edba71ba83b7d2e14e9 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47143 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/acer/g43t-am3/cmos.layout1
-rw-r--r--src/mainboard/amd/inagua/cmos.layout3
-rw-r--r--src/mainboard/amd/olivehill/cmos.layout1
-rw-r--r--src/mainboard/amd/parmer/cmos.layout1
-rw-r--r--src/mainboard/amd/persimmon/cmos.layout3
-rw-r--r--src/mainboard/amd/south_station/cmos.layout3
-rw-r--r--src/mainboard/amd/thatcher/cmos.layout1
-rw-r--r--src/mainboard/amd/union_station/cmos.layout3
-rw-r--r--src/mainboard/apple/macbook21/cmos.layout26
-rw-r--r--src/mainboard/apple/macbookair4_2/cmos.layout24
-rw-r--r--src/mainboard/asrock/b85m_pro4/cmos.layout2
-rw-r--r--src/mainboard/asrock/e350m1/cmos.layout3
-rw-r--r--src/mainboard/asrock/g41c-gs/cmos.layout25
-rw-r--r--src/mainboard/asrock/h110m/cmos.layout47
-rw-r--r--src/mainboard/asrock/h81m-hds/cmos.layout22
-rw-r--r--src/mainboard/asrock/imb-a180/cmos.layout1
-rw-r--r--src/mainboard/asus/a88xm-e/cmos.layout1
-rw-r--r--src/mainboard/asus/am1i-a/cmos.layout1
-rw-r--r--src/mainboard/asus/f2a85-m/cmos.layout1
-rw-r--r--src/mainboard/asus/h61m-cs/cmos.layout27
-rw-r--r--src/mainboard/asus/maximus_iv_gene-z/cmos.layout22
-rw-r--r--src/mainboard/asus/p5gc-mx/cmos.layout7
-rw-r--r--src/mainboard/asus/p5qc/cmos.layout23
-rw-r--r--src/mainboard/asus/p5ql-em/cmos.layout5
-rw-r--r--src/mainboard/asus/p5qpl-am/cmos.layout25
-rw-r--r--src/mainboard/asus/p8h61-m_lx/cmos.layout22
-rw-r--r--src/mainboard/asus/p8h61-m_pro/cmos.layout27
-rw-r--r--src/mainboard/asus/p8z77-m_pro/cmos.layout22
-rw-r--r--src/mainboard/bap/ode_e20XX/cmos.layout1
-rw-r--r--src/mainboard/biostar/a68n_5200/cmos.layout1
-rw-r--r--src/mainboard/biostar/am1ml/cmos.layout1
-rw-r--r--src/mainboard/dell/optiplex_9010/cmos.layout20
-rw-r--r--src/mainboard/elmex/pcm205400/cmos.layout3
-rw-r--r--src/mainboard/facebook/fbg1701/cmos.layout48
-rw-r--r--src/mainboard/facebook/monolith/cmos.layout48
-rw-r--r--src/mainboard/foxconn/d41s/cmos.layout6
-rw-r--r--src/mainboard/foxconn/g41s-k/cmos.layout25
-rw-r--r--src/mainboard/getac/p470/cmos.layout26
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout26
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout27
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout26
-rw-r--r--src/mainboard/gigabyte/ga-h61m-series/cmos.layout27
-rw-r--r--src/mainboard/gizmosphere/gizmo/cmos.layout3
-rw-r--r--src/mainboard/gizmosphere/gizmo2/cmos.layout1
-rw-r--r--src/mainboard/google/auron/cmos.layout27
-rw-r--r--src/mainboard/google/beltino/cmos.layout27
-rw-r--r--src/mainboard/google/butterfly/cmos.layout28
-rw-r--r--src/mainboard/google/cyan/cmos.layout47
-rw-r--r--src/mainboard/google/glados/cmos.layout47
-rw-r--r--src/mainboard/google/jecht/cmos.layout47
-rw-r--r--src/mainboard/google/link/cmos.layout28
-rw-r--r--src/mainboard/google/parrot/cmos.layout28
-rw-r--r--src/mainboard/google/rambi/cmos.layout27
-rw-r--r--src/mainboard/google/slippy/cmos.layout27
-rw-r--r--src/mainboard/google/stout/cmos.layout28
-rw-r--r--src/mainboard/hp/abm/cmos.layout1
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/cmos.layout27
-rw-r--r--src/mainboard/hp/snb_ivb_laptops/cmos.layout25
-rw-r--r--src/mainboard/hp/z220_sff_workstation/cmos.layout27
-rw-r--r--src/mainboard/ibase/mb899/cmos.layout28
-rw-r--r--src/mainboard/intel/baskingridge/cmos.layout27
-rw-r--r--src/mainboard/intel/d510mo/cmos.layout6
-rw-r--r--src/mainboard/intel/d945gclf/cmos.layout26
-rw-r--r--src/mainboard/intel/dg41wv/cmos.layout25
-rw-r--r--src/mainboard/intel/dg43gt/cmos.layout24
-rw-r--r--src/mainboard/intel/emeraldlake2/cmos.layout28
-rw-r--r--src/mainboard/intel/kblrvp/cmos.layout47
-rw-r--r--src/mainboard/intel/kunimitsu/cmos.layout47
-rw-r--r--src/mainboard/intel/saddlebrook/cmos.layout46
-rw-r--r--src/mainboard/intel/strago/cmos.layout47
-rw-r--r--src/mainboard/intel/wtm2/cmos.layout27
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/cmos.layout3
-rw-r--r--src/mainboard/kontron/986lcd-m/cmos.layout28
-rw-r--r--src/mainboard/kontron/ktqm77/cmos.layout27
-rw-r--r--src/mainboard/lenovo/g505s/cmos.layout1
-rw-r--r--src/mainboard/lenovo/l520/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t400/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t410/cmos.layout26
-rw-r--r--src/mainboard/lenovo/t420/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t420s/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t430/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t430s/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t440p/cmos.layout24
-rw-r--r--src/mainboard/lenovo/t520/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t530/cmos.layout25
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout27
-rw-r--r--src/mainboard/lenovo/thinkcentre_a58/cmos.layout25
-rw-r--r--src/mainboard/lenovo/x131e/cmos.layout26
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/cmos.layout25
-rw-r--r--src/mainboard/lenovo/x200/cmos.layout25
-rw-r--r--src/mainboard/lenovo/x201/cmos.layout26
-rw-r--r--src/mainboard/lenovo/x220/cmos.layout26
-rw-r--r--src/mainboard/lenovo/x230/cmos.layout25
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout27
-rw-r--r--src/mainboard/lippert/frontrunner-af/cmos.layout3
-rw-r--r--src/mainboard/msi/ms7721/cmos.layout1
-rw-r--r--src/mainboard/packardbell/ms2290/cmos.layout24
-rw-r--r--src/mainboard/pcengines/apu1/cmos.layout1
-rw-r--r--src/mainboard/pcengines/apu2/cmos.layout1
-rw-r--r--src/mainboard/portwell/m107/cmos.layout48
-rw-r--r--src/mainboard/roda/rk886ex/cmos.layout27
-rw-r--r--src/mainboard/roda/rk9/cmos.layout28
-rw-r--r--src/mainboard/roda/rv11/cmos.layout30
-rw-r--r--src/mainboard/samsung/lumpy/cmos.layout28
-rw-r--r--src/mainboard/samsung/stumpy/cmos.layout27
-rw-r--r--src/mainboard/sapphire/pureplatinumh61/cmos.layout27
-rw-r--r--src/mainboard/supermicro/x10slm-f/cmos.layout22
107 files changed, 0 insertions, 2265 deletions
diff --git a/src/mainboard/acer/g43t-am3/cmos.layout b/src/mainboard/acer/g43t-am3/cmos.layout
index 5f51bb83988b..837763165948 100644
--- a/src/mainboard/acer/g43t-am3/cmos.layout
+++ b/src/mainboard/acer/g43t-am3/cmos.layout
@@ -25,7 +25,6 @@ entries
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout
index 2df318f0363a..cbf1d466ec8a 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -53,11 +29,9 @@ entries
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
937 1 e 1 lpt
-#938 46 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/apple/macbookair4_2/cmos.layout b/src/mainboard/apple/macbookair4_2/cmos.layout
index f4ecb1ecdf2c..3fffea5e9ef7 100644
--- a/src/mainboard/apple/macbookair4_2/cmos.layout
+++ b/src/mainboard/apple/macbookair4_2/cmos.layout
@@ -3,45 +3,21 @@
# -----------------------------------------------------------------
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
#432 5 e 11 gfx_uma_size
-#437 3 r 0 unused
#440 8 h 0 volume
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
diff --git a/src/mainboard/asrock/b85m_pro4/cmos.layout b/src/mainboard/asrock/b85m_pro4/cmos.layout
index ed022330ddbd..efdc333fc26b 100644
--- a/src/mainboard/asrock/b85m_pro4/cmos.layout
+++ b/src/mainboard/asrock/b85m_pro4/cmos.layout
@@ -14,7 +14,6 @@
984 16 h 0 check_sum
# -----------------------------------------------------------------
-
# -----------------------------------------------------------------
enumerations
# -----------------------------------------------------------------
@@ -41,7 +40,6 @@
5 2 Keep
# -----------------------------------------------------------------
-
# -----------------------------------------------------------------
checksums
# -----------------------------------------------------------------
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 75526c622719..b35f0d22496c 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/asrock/g41c-gs/cmos.layout b/src/mainboard/asrock/g41c-gs/cmos.layout
index c4f1b0821684..ed5cac5725c9 100644
--- a/src/mainboard/asrock/g41c-gs/cmos.layout
+++ b/src/mainboard/asrock/g41c-gs/cmos.layout
@@ -4,50 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asrock/h110m/cmos.layout b/src/mainboard/asrock/h110m/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/asrock/h110m/cmos.layout
+++ b/src/mainboard/asrock/h110m/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/asrock/h81m-hds/cmos.layout b/src/mainboard/asrock/h81m-hds/cmos.layout
index e03d040796db..1f89bef58123 100644
--- a/src/mainboard/asrock/h81m-hds/cmos.layout
+++ b/src/mainboard/asrock/h81m-hds/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -33,9 +13,7 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 4 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/asus/a88xm-e/cmos.layout b/src/mainboard/asus/a88xm-e/cmos.layout
index 235529241149..fa85c710b308 100644
--- a/src/mainboard/asus/a88xm-e/cmos.layout
+++ b/src/mainboard/asus/a88xm-e/cmos.layout
@@ -5,7 +5,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/asus/am1i-a/cmos.layout b/src/mainboard/asus/am1i-a/cmos.layout
index 9f9ee80faa9b..c00b1c67ebad 100644
--- a/src/mainboard/asus/am1i-a/cmos.layout
+++ b/src/mainboard/asus/am1i-a/cmos.layout
@@ -9,7 +9,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 r 0 reboot_counter
-#392 3 r 0 unused
#400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
416 4 e 7 boot_first
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/asus/h61m-cs/cmos.layout b/src/mainboard/asus/h61m-cs/cmos.layout
index 1860a78326b9..0913b6d66dfc 100644
--- a/src/mainboard/asus/h61m-cs/cmos.layout
+++ b/src/mainboard/asus/h61m-cs/cmos.layout
@@ -4,54 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 2 r 0 unused
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/maximus_iv_gene-z/cmos.layout b/src/mainboard/asus/maximus_iv_gene-z/cmos.layout
index c8c53e745cd1..d3ce21948a0b 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/cmos.layout
+++ b/src/mainboard/asus/maximus_iv_gene-z/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -33,9 +13,7 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 4 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
diff --git a/src/mainboard/asus/p5gc-mx/cmos.layout b/src/mainboard/asus/p5gc-mx/cmos.layout
index a7c4b7dba7d1..356f38ec6f83 100644
--- a/src/mainboard/asus/p5gc-mx/cmos.layout
+++ b/src/mainboard/asus/p5gc-mx/cmos.layout
@@ -3,22 +3,17 @@
# -----------------------------------------------------------------
entries
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -28,11 +23,9 @@ entries
# coreboot config options: bootloader
416 512 s 0 boot_devices
-#928 80 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/asus/p5qc/cmos.layout b/src/mainboard/asus/p5qc/cmos.layout
index 3e8d5f0a774c..cd00074c9c8b 100644
--- a/src/mainboard/asus/p5qc/cmos.layout
+++ b/src/mainboard/asus/p5qc/cmos.layout
@@ -4,33 +4,12 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
@@ -42,10 +21,8 @@ entries
411 1 e 1 nmi
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
-#432 554 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/p5ql-em/cmos.layout b/src/mainboard/asus/p5ql-em/cmos.layout
index e98886258b18..b306341dc588 100644
--- a/src/mainboard/asus/p5ql-em/cmos.layout
+++ b/src/mainboard/asus/p5ql-em/cmos.layout
@@ -5,29 +5,24 @@ entries
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
# coreboot config options: southbridge
-#408 1 e 0 unused
409 2 e 7 power_on_after_fail
411 1 e 1 nmi
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#436 548 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/p5qpl-am/cmos.layout b/src/mainboard/asus/p5qpl-am/cmos.layout
index b1f6e7755887..cbf83229c9d9 100644
--- a/src/mainboard/asus/p5qpl-am/cmos.layout
+++ b/src/mainboard/asus/p5qpl-am/cmos.layout
@@ -4,50 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/p8h61-m_lx/cmos.layout b/src/mainboard/asus/p8h61-m_lx/cmos.layout
index 2aef2ac8766e..7fcbcfbfd416 100644
--- a/src/mainboard/asus/p8h61-m_lx/cmos.layout
+++ b/src/mainboard/asus/p8h61-m_lx/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -33,9 +13,7 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 4 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
diff --git a/src/mainboard/asus/p8h61-m_pro/cmos.layout b/src/mainboard/asus/p8h61-m_pro/cmos.layout
index 1860a78326b9..0913b6d66dfc 100644
--- a/src/mainboard/asus/p8h61-m_pro/cmos.layout
+++ b/src/mainboard/asus/p8h61-m_pro/cmos.layout
@@ -4,54 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 2 r 0 unused
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/asus/p8z77-m_pro/cmos.layout b/src/mainboard/asus/p8z77-m_pro/cmos.layout
index 1b82ffde135d..a912c2949652 100644
--- a/src/mainboard/asus/p8z77-m_pro/cmos.layout
+++ b/src/mainboard/asus/p8z77-m_pro/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -33,9 +13,7 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 4 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
# -----------------------------------------------------------------
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/biostar/a68n_5200/cmos.layout b/src/mainboard/biostar/a68n_5200/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/biostar/a68n_5200/cmos.layout
+++ b/src/mainboard/biostar/a68n_5200/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index 0cf4ede05ab5..dd4d88cd66d7 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -32,7 +32,6 @@ entries
384 1 e 4 boot_option
386 1 e 1 ECC_memory
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/dell/optiplex_9010/cmos.layout b/src/mainboard/dell/optiplex_9010/cmos.layout
index dcf9639d3f5e..524907712f29 100644
--- a/src/mainboard/dell/optiplex_9010/cmos.layout
+++ b/src/mainboard/dell/optiplex_9010/cmos.layout
@@ -4,25 +4,6 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
# -----------------------------------------------------------------
@@ -88,7 +69,6 @@ enumerations
9 5 192M
9 6 224M
-
# -----------------------------------------------------------------
checksums
diff --git a/src/mainboard/elmex/pcm205400/cmos.layout b/src/mainboard/elmex/pcm205400/cmos.layout
index bc5b4285884b..dd3536540967 100644
--- a/src/mainboard/elmex/pcm205400/cmos.layout
+++ b/src/mainboard/elmex/pcm205400/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 r 0 reboot_bits
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/facebook/fbg1701/cmos.layout b/src/mainboard/facebook/fbg1701/cmos.layout
index f80f2c597f98..45b17be291bc 100644
--- a/src/mainboard/facebook/fbg1701/cmos.layout
+++ b/src/mainboard/facebook/fbg1701/cmos.layout
@@ -4,78 +4,30 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
# reboot_counter reserved for core, not used by platform.
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#400 1 e 2 unused
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
-#416 568 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/facebook/monolith/cmos.layout b/src/mainboard/facebook/monolith/cmos.layout
index 61c34f3a9406..0be89b60dbe3 100644
--- a/src/mainboard/facebook/monolith/cmos.layout
+++ b/src/mainboard/facebook/monolith/cmos.layout
@@ -4,78 +4,30 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
# reboot_counter reserved for core, not used by platform.
388 4 h 0 reboot_counter
-#390 2 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#400 1 e 2 unused
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
-#416 568 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/foxconn/d41s/cmos.layout b/src/mainboard/foxconn/d41s/cmos.layout
index 0a329956af95..fa9bd2673637 100644
--- a/src/mainboard/foxconn/d41s/cmos.layout
+++ b/src/mainboard/foxconn/d41s/cmos.layout
@@ -3,22 +3,17 @@
# -----------------------------------------------------------------
entries
-
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -30,7 +25,6 @@ entries
416 512 s 0 boot_devices
# coreboot config options: cpu
-#945 7 r 0 unused
# coreboot config options: northbridge
952 3 e 11 gfx_uma_size
diff --git a/src/mainboard/foxconn/g41s-k/cmos.layout b/src/mainboard/foxconn/g41s-k/cmos.layout
index c4f1b0821684..ed5cac5725c9 100644
--- a/src/mainboard/foxconn/g41s-k/cmos.layout
+++ b/src/mainboard/foxconn/g41s-k/cmos.layout
@@ -4,50 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout
index 5f60dc98afb3..f96a51aae033 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -53,11 +29,9 @@ entries
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
937 1 e 1 lpt
-#938 46 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
index e0d6ec5244e7..58f96f03f1a9 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -50,11 +26,9 @@ entries
# coreboot config options: bootloader
416 512 s 0 boot_devices
-#928 80 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index 1860a78326b9..0913b6d66dfc 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -4,54 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 2 r 0 unused
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
index 46940bd91f13..1a26c25ca87e 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -4,51 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/gigabyte/ga-h61m-series/cmos.layout b/src/mainboard/gigabyte/ga-h61m-series/cmos.layout
index 1860a78326b9..0913b6d66dfc 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/cmos.layout
+++ b/src/mainboard/gigabyte/ga-h61m-series/cmos.layout
@@ -4,54 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 2 r 0 unused
# coreboot config options: cpu
-#425 7 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index da1b185c7ef2..3b2b829209c2 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -4,53 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -58,7 +32,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/beltino/cmos.layout b/src/mainboard/google/beltino/cmos.layout
index da1b185c7ef2..3b2b829209c2 100644
--- a/src/mainboard/google/beltino/cmos.layout
+++ b/src/mainboard/google/beltino/cmos.layout
@@ -4,53 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -58,7 +32,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index bee1e86fe5ed..9bd6d1b7f659 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -4,51 +4,26 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
# No serial port on this motherboard
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
# hyper_threading not supported by the Celeron 847 on this board
#400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -57,8 +32,6 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
@@ -66,7 +39,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index 0cf582192b7b..eecfdfaf4bdd 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -4,49 +4,24 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -55,15 +30,12 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index 0cf582192b7b..eecfdfaf4bdd 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -4,49 +4,24 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -55,15 +30,12 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index da1b185c7ef2..3b2b829209c2 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -4,53 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -58,7 +32,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index da1b185c7ef2..3b2b829209c2 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/cmos.layout
@@ -4,53 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -58,7 +32,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index 0cf582192b7b..eecfdfaf4bdd 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -4,49 +4,24 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -55,15 +30,12 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/cmos.layout b/src/mainboard/hp/compaq_8200_elite_sff/cmos.layout
index e26a347b0e08..7666ddb5cd73 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/cmos.layout
+++ b/src/mainboard/hp/compaq_8200_elite_sff/cmos.layout
@@ -4,53 +4,26 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
400 3 h 0 psu_fan_lvl
-#403 5 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 10 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
diff --git a/src/mainboard/hp/snb_ivb_laptops/cmos.layout b/src/mainboard/hp/snb_ivb_laptops/cmos.layout
index 858dc4e69e9b..10b2e2a622e1 100644
--- a/src/mainboard/hp/snb_ivb_laptops/cmos.layout
+++ b/src/mainboard/hp/snb_ivb_laptops/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -47,11 +24,9 @@ entries
421 1 e 9 sata_mode
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 5 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/hp/z220_sff_workstation/cmos.layout b/src/mainboard/hp/z220_sff_workstation/cmos.layout
index 33b2068e2bb0..f5185028e836 100644
--- a/src/mainboard/hp/z220_sff_workstation/cmos.layout
+++ b/src/mainboard/hp/z220_sff_workstation/cmos.layout
@@ -4,53 +4,26 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
400 3 h 0 psu_fan_lvl
-#403 5 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 10 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
448 128 r 0 vbnv
diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout
index e51185bc8f99..61e63ebd46bc 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -50,7 +26,6 @@ entries
# coreboot config options: bootloader
416 512 s 0 boot_devices
-#928 40 r 0 unused
# coreboot config options: mainboard specific options
948 2 e 8 cpufan_cruise_control
@@ -64,11 +39,8 @@ entries
969 1 e 2 ethernet2
970 1 e 2 ethernet3
-#971 13 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index 7c4d61419660..6d2caea1107f 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -4,57 +4,30 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/d510mo/cmos.layout b/src/mainboard/intel/d510mo/cmos.layout
index 0a329956af95..fa9bd2673637 100644
--- a/src/mainboard/intel/d510mo/cmos.layout
+++ b/src/mainboard/intel/d510mo/cmos.layout
@@ -3,22 +3,17 @@
# -----------------------------------------------------------------
entries
-
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -30,7 +25,6 @@ entries
416 512 s 0 boot_devices
# coreboot config options: cpu
-#945 7 r 0 unused
# coreboot config options: northbridge
952 3 e 11 gfx_uma_size
diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout
index e0d6ec5244e7..58f96f03f1a9 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -50,11 +26,9 @@ entries
# coreboot config options: bootloader
416 512 s 0 boot_devices
-#928 80 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/intel/dg41wv/cmos.layout b/src/mainboard/intel/dg41wv/cmos.layout
index b1f6e7755887..cbf83229c9d9 100644
--- a/src/mainboard/intel/dg41wv/cmos.layout
+++ b/src/mainboard/intel/dg41wv/cmos.layout
@@ -4,50 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/intel/dg43gt/cmos.layout b/src/mainboard/intel/dg43gt/cmos.layout
index 2174ecd0971b..0bd628c7a786 100644
--- a/src/mainboard/intel/dg43gt/cmos.layout
+++ b/src/mainboard/intel/dg43gt/cmos.layout
@@ -4,33 +4,12 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
@@ -42,12 +21,9 @@ entries
411 1 e 1 nmi
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index 8c19c753b104..8d47ab18bcf9 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -4,49 +4,24 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -55,15 +30,12 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/kblrvp/cmos.layout b/src/mainboard/intel/kblrvp/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/intel/kblrvp/cmos.layout
+++ b/src/mainboard/intel/kblrvp/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/saddlebrook/cmos.layout b/src/mainboard/intel/saddlebrook/cmos.layout
index cc55ccfc7135..82d91a3c76cb 100644
--- a/src/mainboard/intel/saddlebrook/cmos.layout
+++ b/src/mainboard/intel/saddlebrook/cmos.layout
@@ -4,72 +4,26 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
-#544 440 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index 8c2244fa5526..c66bb078021b 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -4,75 +4,29 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -80,7 +34,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index da1b185c7ef2..3b2b829209c2 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -4,53 +4,27 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
416 128 r 0 vbnv
-#544 440 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
@@ -58,7 +32,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout
index cf758b1c3817..05ddf368feaf 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -52,7 +28,6 @@ entries
416 512 s 0 boot_devices
928 8 h 0 boot_default
936 1 e 11 cmos_defaults_loaded
-#937 11 r 0 unused
# coreboot config options: mainboard specific options
948 2 e 8 cpufan_cruise_control
@@ -67,11 +42,8 @@ entries
970 1 e 2 ethernet3
971 1 e 1 lpt
-#972 12 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index d63c75deb120..d3ad3233c15f 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -4,46 +4,21 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
401 3 e 12 gfx_uma_size
-#404 3 r 0 unused
-
# coreboot config options: southbridge
407 1 e 1 nmi
408 2 e 7 power_on_after_fail
@@ -63,7 +38,6 @@ entries
848 1 e 9 cmos_defaults_loaded
849 1 e 2 ethernet1
850 1 e 2 ethernet2
-#851 5 r 0 unused
# coreboot config options: mainboard specific options
856 2 e 8 fan1_mode
@@ -80,7 +54,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index fa4f10be441b..d2e1f28bab32 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/lenovo/l520/cmos.layout b/src/mainboard/lenovo/l520/cmos.layout
index aecd7f3bca04..0d5968c394a0 100644
--- a/src/mainboard/lenovo/l520/cmos.layout
+++ b/src/mainboard/lenovo/l520/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,11 +35,9 @@ entries
422 2 e 10 backlight
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 5 r 0 unused
440 8 h 0 volume
# SandyBridge MRC Scrambler Seed values
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index 8d6b608cde79..f5cf15c4f016 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 240 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -57,7 +34,6 @@ entries
427 1 e 1 low_battery_beep
428 1 e 1 uwb
-
# coreboot config options: bootloader
432 512 s 0 boot_devices
944 8 h 0 boot_default
@@ -68,7 +44,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 unused
# RAM initialization internal data
1024 128 r 0 read_training_results
diff --git a/src/mainboard/lenovo/t410/cmos.layout b/src/mainboard/lenovo/t410/cmos.layout
index f3e1559a018b..0ca4d7af0e07 100644
--- a/src/mainboard/lenovo/t410/cmos.layout
+++ b/src/mainboard/lenovo/t410/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -57,11 +34,9 @@ entries
420 1 e 1 low_battery_beep
421 1 e 9 sata_mode
422 2 e 11 usb_always_on
-#423 1 r 1 unused
# coreboot config options: northbridge
424 3 e 10 gfx_uma_size
-#427 5 r 0 unused
432 2 e 12 hybrid_graphics_mode
# VBOOT
@@ -69,7 +44,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index ce5f04d47f37..2f6701345063 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,12 +35,10 @@ entries
422 2 e 13 usb_always_on
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 2 e 12 hybrid_graphics_mode
-#437 3 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index ce5f04d47f37..2f6701345063 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,12 +35,10 @@ entries
422 2 e 13 usb_always_on
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 2 e 12 hybrid_graphics_mode
-#437 3 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/t430/cmos.layout b/src/mainboard/lenovo/t430/cmos.layout
index b38a91b189fe..e3d3c92ba3ad 100644
--- a/src/mainboard/lenovo/t430/cmos.layout
+++ b/src/mainboard/lenovo/t430/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,12 +35,10 @@ entries
422 2 e 10 backlight
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 2 e 12 hybrid_graphics_mode
-#437 3 r 0 unused
440 8 h 0 volume
# VBOOT
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index 1697806aa372..0b7230341a44 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -59,12 +36,10 @@ entries
424 1 e 1 f1_to_f12_as_primary
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 1 e 1 enable_dual_graphics
-#436 4 r 0 unused
440 8 h 0 volume
# VBOOT
diff --git a/src/mainboard/lenovo/t440p/cmos.layout b/src/mainboard/lenovo/t440p/cmos.layout
index 222ab40fb816..4287eead03e3 100644
--- a/src/mainboard/lenovo/t440p/cmos.layout
+++ b/src/mainboard/lenovo/t440p/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -56,7 +33,6 @@ entries
# coreboot config options: northbridge
435 1 e 1 enable_dual_graphics
-#437 3 r 0 unused
440 8 h 0 volume
# VBOOT
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 2dfd682c5adf..4f657fdc3f06 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,12 +35,10 @@ entries
422 2 e 10 backlight
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 2 e 12 hybrid_graphics_mode
-#437 3 r 0 unused
440 8 h 0 volume
# VBOOT
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 4130b5f80665..a3b0f0637c3a 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,12 +35,10 @@ entries
422 2 e 10 backlight
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
435 2 e 12 hybrid_graphics_mode
-#437 3 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 246d15d0c531..62f5dbab0345 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -52,10 +29,8 @@ entries
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
937 1 e 1 lpt
-#938 7 r 0 unused
# coreboot config options: cpu
-#945 3 r 0 unused
# coreboot config options: ec
948 1 e 1 touchpad
@@ -65,14 +40,12 @@ entries
952 8 h 0 volume
960 1 e 9 first_battery
961 1 e 1 trackpoint
-#962 1 r 0 unused
963 1 e 1 sticky_fn
964 1 e 1 power_management_beeps
965 1 e 1 low_battery_beep
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/lenovo/thinkcentre_a58/cmos.layout b/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
index b1f6e7755887..cbf83229c9d9 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
+++ b/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
@@ -4,50 +4,25 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 5 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 4 e 11 gfx_uma_size
-#435 549 r 0 unused
-
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/lenovo/x131e/cmos.layout b/src/mainboard/lenovo/x131e/cmos.layout
index 32394de59afd..2b6253cde04f 100644
--- a/src/mainboard/lenovo/x131e/cmos.layout
+++ b/src/mainboard/lenovo/x131e/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -54,14 +31,11 @@ entries
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
419 2 e 12 usb_always_on
-#421 3 r 0 unused
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 5 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
index a3d2a0fb6428..e2abae685974 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
+++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -58,11 +35,9 @@ entries
422 2 e 10 backlight
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 5 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 95c7930fd51a..e300bdf5e891 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 240 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -66,7 +43,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 unused
# RAM initialization internal data
1024 128 r 0 read_training_results
@@ -74,7 +50,6 @@ entries
# VBOOT
1152 128 r 0 vbnv
-
# -----------------------------------------------------------------
enumerations
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index 6dc55b24ec2a..a8c1d7969a97 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -57,11 +34,9 @@ entries
420 1 e 1 low_battery_beep
421 1 e 9 sata_mode
422 2 e 11 usb_always_on
-#423 1 r 1 unused
# coreboot config options: northbridge
424 3 e 10 gfx_uma_size
-#427 5 r 0 unused
432 8 h 0 volume
# VBOOT
@@ -69,7 +44,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index 740f57a7000f..ec4cbcbe3e31 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -56,14 +33,11 @@ entries
419 1 e 1 power_management_beeps
421 1 e 9 sata_mode
422 2 e 12 usb_always_on
-#423 1 r 1 unused
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
440 8 h 0 volume
# VBOOT
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 6a6cdd537be1..30845d2db8ea 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -59,11 +36,9 @@ entries
424 1 e 1 f1_to_f12_as_primary
# coreboot config options: cpu
-#424 8 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 5 r 0 unused
440 8 h 0 volume
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 70dcd35210e8..dcddc69cd2d6 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -52,10 +29,8 @@ entries
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
937 1 e 1 lpt
-#938 6 r 0 unused
# coreboot config options: cpu
-#945 4 r 0 unused
# coreboot config options: ec
949 1 e 9 first_battery
@@ -63,7 +38,6 @@ entries
951 1 e 1 wwan
952 1 e 1 wlan
953 1 e 1 trackpoint
-#954 1 r 0 unused
955 1 e 1 sticky_fn
956 1 e 1 power_management_beeps
959 1 e 1 low_battery_beep
@@ -72,7 +46,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index beedaa79305b..18bac8ee3453 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
@@ -24,8 +23,6 @@ entries
# Reserve the extended AMD configuration registers
1000 24 r 0 amd_reserved
-
-
enumerations
#ID value text
diff --git a/src/mainboard/msi/ms7721/cmos.layout b/src/mainboard/msi/ms7721/cmos.layout
index ade4c04bf3b9..18bac8ee3453 100644
--- a/src/mainboard/msi/ms7721/cmos.layout
+++ b/src/mainboard/msi/ms7721/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout
index a3cd554cd276..809f913612b8 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -48,7 +25,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout
index f2c551f4bf1b..a1165b118b5e 100644
--- a/src/mainboard/pcengines/apu1/cmos.layout
+++ b/src/mainboard/pcengines/apu1/cmos.layout
@@ -6,7 +6,6 @@ entries
# leave 3 bits to make checksummed area start byte-aligned
392 1 e 2 boot_option
393 1 e 1 multi_core
-#394 6 unused
400 4 e 4 debug_level
# leave 7 bits to make checksummed area end byte-aligned
408 16 h 0 check_sum
diff --git a/src/mainboard/pcengines/apu2/cmos.layout b/src/mainboard/pcengines/apu2/cmos.layout
index 8663fcc1ae9b..dd3536540967 100644
--- a/src/mainboard/pcengines/apu2/cmos.layout
+++ b/src/mainboard/pcengines/apu2/cmos.layout
@@ -8,7 +8,6 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
388 4 r 0 reboot_bits
-#392 3 r 0 unused
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
397 2 e 8 max_mem_clock
diff --git a/src/mainboard/portwell/m107/cmos.layout b/src/mainboard/portwell/m107/cmos.layout
index f80f2c597f98..45b17be291bc 100644
--- a/src/mainboard/portwell/m107/cmos.layout
+++ b/src/mainboard/portwell/m107/cmos.layout
@@ -4,78 +4,30 @@
entries
#start-bit length config config-ID name
-#0 8 r 0 seconds
-#8 8 r 0 alarm_seconds
-#16 8 r 0 minutes
-#24 8 r 0 alarm_minutes
-#32 8 r 0 hours
-#40 8 r 0 alarm_hours
-#48 8 r 0 day_of_week
-#56 8 r 0 day_of_month
-#64 8 r 0 month
-#72 8 r 0 year
-# -----------------------------------------------------------------
-# Status Register A
-#80 4 r 0 rate_select
-#84 3 r 0 REF_Clock
-#87 1 r 0 UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88 1 r 0 auto_switch_DST
-#89 1 r 0 24_hour_mode
-#90 1 r 0 binary_values_enable
-#91 1 r 0 square-wave_out_enable
-#92 1 r 0 update_finished_enable
-#93 1 r 0 alarm_interrupt_enable
-#94 1 r 0 periodic_interrupt_enable
-#95 1 r 0 disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
# reboot_counter reserved for core, not used by platform.
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#400 1 e 2 unused
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 5 r 0 unused
# coreboot config options: bootloader
-#416 568 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index 755aad009fbd..f96a51aae033 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -4,42 +4,18 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
@@ -48,17 +24,14 @@ entries
# coreboot config options: northbridge
411 3 e 11 gfx_uma_size
-
# coreboot config options: bootloader
416 512 s 0 boot_devices
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
937 1 e 1 lpt
-#938 46 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# RAM initialization internal data
1024 8 r 0 C0WL0REOST
diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout
index 2dce4640c96b..526bc5e69073 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -4,52 +4,26 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
-#400 8 r 0 unused
# coreboot config options: southbridge
408 1 e 9 sata_mode
-#409 7 r 0 unused
# coreboot config options: bootloader
416 512 s 0 boot_devices
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
-#937 7 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
@@ -57,8 +31,6 @@ entries
# coreboot config options: northbridge
1000 4 e 10 gfx_uma_size
-#1004 20 r 0 unused
-
# RAM initialization internal data
1024 128 r 0 read_training_results
diff --git a/src/mainboard/roda/rv11/cmos.layout b/src/mainboard/roda/rv11/cmos.layout
index ea36a2664408..c32eed267f58 100644
--- a/src/mainboard/roda/rv11/cmos.layout
+++ b/src/mainboard/roda/rv11/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -34,40 +14,30 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 5 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
401 3 e 9 gfx_uma_size
-#404 4 r 0 unused
-
# coreboot config options: southbridge
408 1 e 1 nmi
-#409 2 r 0 unused
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
416 424 s 0 boot_devices
840 8 h 0 boot_default
848 1 e 7 cmos_defaults_loaded
-#851 5 r 0 unused
# coreboot config options: mainboard specific options
-#856 40 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
960 16 r 0 mrc_scrambler_seed_chk
-#976 8 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index 4f80ef06e7c6..8f831ac48bc9 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -4,49 +4,24 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# coreboot config options: cpu
400 1 e 2 hyper_threading
-#401 7 r 0 unused
# coreboot config options: southbridge
408 1 e 1 nmi
#409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -55,15 +30,12 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout
index 8977a9acc8ca..26ac57e71d1a 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused?
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
# Stumpy USB reset workaround disable
400 8 r 0 stumpy_usb_reset_disable
@@ -45,7 +22,6 @@ entries
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 8 sata_mode
-#412 4 r 0 unused
# coreboot config options: bootloader
#Used by ChromeOS:
@@ -54,8 +30,6 @@ entries
# coreboot config options: northbridge
544 3 e 11 gfx_uma_size
-#547 437 r 0 unused
-
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
928 32 r 0 mrc_scrambler_seed_s3
@@ -63,7 +37,6 @@ entries
# coreboot config options: check sums
984 16 h 0 check_sum
-#1000 24 r 0 amd_reserved
# -----------------------------------------------------------------
diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.layout b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
index 06e9085e4891..62dae3e96829 100644
--- a/src/mainboard/sapphire/pureplatinumh61/cmos.layout
+++ b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
@@ -4,39 +4,16 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
388 4 h 0 reboot_counter
-#390 2 r 0 unused
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 6 debug_level
-#399 1 r 0 unused
400 8 h 0 volume
@@ -44,17 +21,13 @@ entries
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
-#411 10 r 0 unused
421 1 e 9 sata_mode
-#422 2 r 0 unused
# coreboot config options: cpu
424 1 e 2 hyper_threading
-#425 7 r 0 unused
# coreboot config options: northbridge
432 3 e 11 gfx_uma_size
-#435 549 r 0 unused
# SandyBridge MRC Scrambler Seed values
896 32 r 0 mrc_scrambler_seed
diff --git a/src/mainboard/supermicro/x10slm-f/cmos.layout b/src/mainboard/supermicro/x10slm-f/cmos.layout
index 65b1d9b8303b..c48abe4ab436 100644
--- a/src/mainboard/supermicro/x10slm-f/cmos.layout
+++ b/src/mainboard/supermicro/x10slm-f/cmos.layout
@@ -4,27 +4,7 @@
entries
# -----------------------------------------------------------------
-# Status Register A
-# -----------------------------------------------------------------
-# Status Register B
-# -----------------------------------------------------------------
-# Status Register C
-#96 4 r 0 status_c_rsvd
-#100 1 r 0 uf_flag
-#101 1 r 0 af_flag
-#102 1 r 0 pf_flag
-#103 1 r 0 irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104 7 r 0 status_d_rsvd
-#111 1 r 0 valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112 8 r 0 diag_rsvd1
-
-# -----------------------------------------------------------------
0 120 r 0 reserved_memory
-#120 264 r 0 unused
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
@@ -33,9 +13,7 @@ entries
# -----------------------------------------------------------------
# coreboot config options: console
-#392 3 r 0 unused
395 4 e 4 debug_level
-#399 1 r 0 unused
#400 8 r 0 reserved for century byte