diff --git a/src/mainboard/asrock/h110m/cmos.layout b/src/mainboard/asrock/h110m/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/asrock/h110m/cmos.layout
+++ b/src/mainboard/asrock/h110m/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/bostentech/gbyt4/cmos.layout b/src/mainboard/bostentech/gbyt4/cmos.layout
index 018db31..2b8e1a2 100644
--- a/src/mainboard/bostentech/gbyt4/cmos.layout
+++ b/src/mainboard/bostentech/gbyt4/cmos.layout
@@ -11,8 +11,6 @@
 # -----------------------------------------------------------------
 # coreboot config options: console
 395	4	e	6	debug_level
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -26,8 +24,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/beltino/cmos.layout b/src/mainboard/google/beltino/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/google/beltino/cmos.layout
+++ b/src/mainboard/google/beltino/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index 057f6a5..478af54 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -16,10 +16,6 @@
 # No serial port on this motherboard
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-# hyper_threading not supported by the Celeron 847 on this board
-#400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -47,8 +43,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index 5cfca4f..a3b8b9f 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -44,8 +41,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index 5cfca4f..a3b8b9f 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -44,8 +41,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index 5cfca4f..a3b8b9f 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -44,8 +41,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index 7301ef9d..935557c 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -44,8 +41,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/kblrvp/cmos.layout b/src/mainboard/intel/kblrvp/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/intel/kblrvp/cmos.layout
+++ b/src/mainboard/intel/kblrvp/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index 80a4d21..cff042a 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -17,9 +17,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -38,8 +35,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index 77ff743..78d44c1 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 409	2	e	7	power_on_after_fail
@@ -36,8 +33,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index 914ad6d..67887ce 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -16,7 +16,6 @@
 395	4	e	6	debug_level
 
 # coreboot config options: cpu
-400	1	e	2	hyper_threading
 401	3	e	12	gfx_uma_size
 
 # coreboot config options: southbridge
diff --git a/src/mainboard/roda/rv11/cmos.layout b/src/mainboard/roda/rv11/cmos.layout
index 8a48366..5595b85 100644
--- a/src/mainboard/roda/rv11/cmos.layout
+++ b/src/mainboard/roda/rv11/cmos.layout
@@ -17,7 +17,6 @@
 395	4	e	5	debug_level
 
 # coreboot config options: cpu
-400	1	e	2	hyper_threading
 401	3	e	9	gfx_uma_size
 
 # coreboot config options: southbridge
@@ -46,8 +45,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 3	0	Fallback
 3	1	Normal
 5	0	Emergency
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index 60accd7..0dcd09d 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -15,9 +15,6 @@
 # coreboot config options: console
 395	4	e	6	debug_level
 
-# coreboot config options: cpu
-400	1	e	2	hyper_threading
-
 # coreboot config options: southbridge
 408	1	e	1	nmi
 #409	2	e	7	power_on_after_fail
@@ -44,8 +41,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency
diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.default b/src/mainboard/sapphire/pureplatinumh61/cmos.default
index 7cd30cc..38f2bd3 100644
--- a/src/mainboard/sapphire/pureplatinumh61/cmos.default
+++ b/src/mainboard/sapphire/pureplatinumh61/cmos.default
@@ -3,4 +3,3 @@
 power_on_after_fail=Enable
 nmi=Enable
 sata_mode=AHCI
-hyper_threading=Enable
diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.layout b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
index 979c8e2..fabafef 100644
--- a/src/mainboard/sapphire/pureplatinumh61/cmos.layout
+++ b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
@@ -21,9 +21,6 @@
 
 421	1	e	9	sata_mode
 
-# coreboot config options: cpu
-424	1	e	2	hyper_threading
-
 # coreboot config options: northbridge
 432	3	e	11	gfx_uma_size
 
@@ -42,8 +39,6 @@
 #ID	value	text
 1	0	Disable
 1	1	Enable
-2	0	Enable
-2	1	Disable
 4	0	Fallback
 4	1	Normal
 6	0	Emergency