mainboard: Drop unreferenced CMOS options

Remove CMOS options that are not read anywhere in the code. They may
have been used in the native AMD platform code, or got copied around
from board to board and never did anything to begin with.

Change-Id: Ib19ace4fa6e610a28e68fe2612b4e623f200f064
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52638
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
Reviewed-by: Piotr Król <piotr.krol@3mdeb.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

29 files changed, 0 insertions, 423 deletions

diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 28b4b42be1..5043375b3e 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	2	e	3	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -39,18 +33,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/asus/a88xm-e/cmos.layout b/src/mainboard/asus/a88xm-e/cmos.layout
index 4839dd57b8..1a61edf42f 100644
--- a/src/mainboard/asus/a88xm-e/cmos.layout
+++ b/src/mainboard/asus/a88xm-e/cmos.layout
@@ -5,16 +5,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-#456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -38,18 +32,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/biostar/a68n_5200/cmos.layout b/src/mainboard/biostar/a68n_5200/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/biostar/a68n_5200/cmos.layout
+++ b/src/mainboard/biostar/a68n_5200/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index 7430eb0389..bc28e84f72 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -30,12 +30,7 @@ entries
 #96	288	r	0	temporary_filler
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
-386	1	e	1	ECC_memory
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
 416	4	e	7	boot_first
@@ -43,7 +38,6 @@ entries
 424	4	e	7	boot_third
 428	4	h	0	boot_index
 432	8	h	0	boot_countdown
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
 728	256	h	0	user_data
@@ -71,18 +65,6 @@ enumerations
 7	9	Fallback_HDD
 7	10	Fallback_Floppy
 #7	3	ROM
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/elmex/pcm205400/cmos.layout b/src/mainboard/elmex/pcm205400/cmos.layout
index 586e22a9bf..8e0db50283 100644
--- a/src/mainboard/elmex/pcm205400/cmos.layout
+++ b/src/mainboard/elmex/pcm205400/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	r	0	reboot_bits
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.default b/src/mainboard/emulation/qemu-i440fx/cmos.default
index 8594b4620b..57750a2029 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.default
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.default
@@ -1,4 +1,3 @@
 boot_option=Fallback
 power_on_after_fail=Enable
 debug_level=Debug
-ECC_memory=Disable
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index 8963e13e16..5e5a901da0 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -10,7 +10,6 @@ entries
 
 448	1	e	1	power_on_after_fail
 452	4	e	6	debug_level
-456	1	e	1	ECC_memory
 
 # VBOOT
 464	128	r	0	vbnv
diff --git a/src/mainboard/emulation/qemu-q35/cmos.default b/src/mainboard/emulation/qemu-q35/cmos.default
index 8594b4620b..57750a2029 100644
--- a/src/mainboard/emulation/qemu-q35/cmos.default
+++ b/src/mainboard/emulation/qemu-q35/cmos.default
@@ -1,4 +1,3 @@
 boot_option=Fallback
 power_on_after_fail=Enable
 debug_level=Debug
-ECC_memory=Disable
diff --git a/src/mainboard/emulation/qemu-q35/cmos.layout b/src/mainboard/emulation/qemu-q35/cmos.layout
index 8963e13e16..5e5a901da0 100644
--- a/src/mainboard/emulation/qemu-q35/cmos.layout
+++ b/src/mainboard/emulation/qemu-q35/cmos.layout
@@ -10,7 +10,6 @@ entries
 
 448	1	e	1	power_on_after_fail
 452	4	e	6	debug_level
-456	1	e	1	ECC_memory
 
 # VBOOT
 464	128	r	0	vbnv
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 04ffe7e52b..e56c3163a3 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -8,17 +8,11 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 #400	8	r	8	reserved for century byte
 408	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -37,18 +31,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/msi/ms7721/cmos.layout b/src/mainboard/msi/ms7721/cmos.layout
index b076f0a776..82c8dbaf99 100644
--- a/src/mainboard/msi/ms7721/cmos.layout
+++ b/src/mainboard/msi/ms7721/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	h	0	reboot_counter
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/pcengines/apu1/cmos.default b/src/mainboard/pcengines/apu1/cmos.default
index 0906d5ac1e..06b04332a2 100644
--- a/src/mainboard/pcengines/apu1/cmos.default
+++ b/src/mainboard/pcengines/apu1/cmos.default
@@ -1,3 +1,2 @@
 boot_option=Fallback
-multi_core=Enable
 debug_level=Debug
diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout
index dd3cd91f30..e36dd6bd61 100644
--- a/src/mainboard/pcengines/apu1/cmos.layout
+++ b/src/mainboard/pcengines/apu1/cmos.layout
@@ -5,7 +5,6 @@ entries
 384	4	r	0	reboot_bits
 # leave 3 bits to make checksummed area start byte-aligned
 392	1	e	2	boot_option
-393	1	e	1	multi_core
 400	4	e	4	debug_level
 # leave 7 bits to make checksummed area end byte-aligned
 408	16	h	0	check_sum
@@ -13,9 +12,6 @@ entries
 enumerations
 
 #<config-id>  <value>  <label>
-## for multi_core
-1	0	Enable
-1	1	Disable
 ## for boot_option
 2	0	Fallback
 2	1	Normal
diff --git a/src/mainboard/pcengines/apu2/cmos.layout b/src/mainboard/pcengines/apu2/cmos.layout
index 586e22a9bf..8e0db50283 100644
--- a/src/mainboard/pcengines/apu2/cmos.layout
+++ b/src/mainboard/pcengines/apu2/cmos.layout
@@ -8,16 +8,10 @@ entries
 0	384	r	0	reserved_memory
 384	1	e	4	boot_option
 388	4	r	0	reboot_bits
-395	1	e	1	hw_scrubber
-396	1	e	1	interleave_chip_selects
-397	2	e	8	max_mem_clock
-399	1	e	2	multi_core
 400	1	e	1	power_on_after_fail
 412	4	e	6	debug_level
-440	4	e	9	slow_cpu
 444	1	e	1	nmi
 445	1	e	1	iommu
-456	1	e	1	ECC_memory
 728	256	h	0	user_data
 984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
@@ -36,18 +30,6 @@ enumerations
 6	6	Info
 6	7	Debug
 6	8	Spew
-8	0	400Mhz
-8	1	333Mhz
-8	2	266Mhz
-8	3	200Mhz
-9	0	off
-9	1	87.5%
-9	2	75.0%
-9	3	62.5%
-9	4	50.0%
-9	5	37.5%
-9	6	25.0%
-9	7	12.5%
 
 checksums