diff --git a/src/mainboard/amd/inagua/OptionsIds.h b/src/mainboard/amd/inagua/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/amd/inagua/OptionsIds.h
+++ b/src/mainboard/amd/inagua/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/olivehill/OptionsIds.h b/src/mainboard/amd/olivehill/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/amd/olivehill/OptionsIds.h
+++ b/src/mainboard/amd/olivehill/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/parmer/OptionsIds.h b/src/mainboard/amd/parmer/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/amd/parmer/OptionsIds.h
+++ b/src/mainboard/amd/parmer/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/persimmon/OptionsIds.h b/src/mainboard/amd/persimmon/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/amd/persimmon/OptionsIds.h
+++ b/src/mainboard/amd/persimmon/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/south_station/OptionsIds.h b/src/mainboard/amd/south_station/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/amd/south_station/OptionsIds.h
+++ b/src/mainboard/amd/south_station/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/thatcher/OptionsIds.h b/src/mainboard/amd/thatcher/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/amd/thatcher/OptionsIds.h
+++ b/src/mainboard/amd/thatcher/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/amd/union_station/OptionsIds.h b/src/mainboard/amd/union_station/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/amd/union_station/OptionsIds.h
+++ b/src/mainboard/amd/union_station/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/asrock/e350m1/OptionsIds.h b/src/mainboard/asrock/e350m1/OptionsIds.h
index 94d0804bc6..bcc52f0811 100644
--- a/src/mainboard/asrock/e350m1/OptionsIds.h
+++ b/src/mainboard/asrock/e350m1/OptionsIds.h
@@ -34,8 +34,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/asrock/imb-a180/OptionsIds.h b/src/mainboard/asrock/imb-a180/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/asrock/imb-a180/OptionsIds.h
+++ b/src/mainboard/asrock/imb-a180/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/asus/a88xm-e/OptionsIds.h b/src/mainboard/asus/a88xm-e/OptionsIds.h
index adbb4763ee..12fe57f178 100644
--- a/src/mainboard/asus/a88xm-e/OptionsIds.h
+++ b/src/mainboard/asus/a88xm-e/OptionsIds.h
@@ -32,8 +32,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/asus/am1i-a/OptionsIds.h b/src/mainboard/asus/am1i-a/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/asus/am1i-a/OptionsIds.h
+++ b/src/mainboard/asus/am1i-a/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/asus/f2a85-m/OptionsIds.h b/src/mainboard/asus/f2a85-m/OptionsIds.h
index 2c1b5a16e4..83db4b651c 100644
--- a/src/mainboard/asus/f2a85-m/OptionsIds.h
+++ b/src/mainboard/asus/f2a85-m/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/bap/ode_e20XX/OptionsIds.h b/src/mainboard/bap/ode_e20XX/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/bap/ode_e20XX/OptionsIds.h
+++ b/src/mainboard/bap/ode_e20XX/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/biostar/a68n_5200/OptionsIds.h b/src/mainboard/biostar/a68n_5200/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/biostar/a68n_5200/OptionsIds.h
+++ b/src/mainboard/biostar/a68n_5200/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/biostar/am1ml/OptionsIds.h b/src/mainboard/biostar/am1ml/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/biostar/am1ml/OptionsIds.h
+++ b/src/mainboard/biostar/am1ml/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/elmex/pcm205400/OptionsIds.h b/src/mainboard/elmex/pcm205400/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/elmex/pcm205400/OptionsIds.h
+++ b/src/mainboard/elmex/pcm205400/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/gizmosphere/gizmo/OptionsIds.h b/src/mainboard/gizmosphere/gizmo/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/gizmosphere/gizmo/OptionsIds.h
+++ b/src/mainboard/gizmosphere/gizmo/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/gizmosphere/gizmo2/OptionsIds.h b/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
+++ b/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/hp/abm/OptionsIds.h b/src/mainboard/hp/abm/OptionsIds.h
index 52873ed3a2..28ecb7d4c0 100644
--- a/src/mainboard/hp/abm/OptionsIds.h
+++ b/src/mainboard/hp/abm/OptionsIds.h
@@ -39,8 +39,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
index 5e55ef4ab7..272d3097f9 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h b/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
+++ b/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/lenovo/g505s/OptionsIds.h b/src/mainboard/lenovo/g505s/OptionsIds.h
index c83b50572c..272d3097f9 100644
--- a/src/mainboard/lenovo/g505s/OptionsIds.h
+++ b/src/mainboard/lenovo/g505s/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-#define IDSOPT_DEBUG_ENABLED  FALSE // turn on for AGESA debug
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/lippert/frontrunner-af/OptionsIds.h b/src/mainboard/lippert/frontrunner-af/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/lippert/frontrunner-af/OptionsIds.h
+++ b/src/mainboard/lippert/frontrunner-af/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/msi/ms7721/OptionsIds.h b/src/mainboard/msi/ms7721/OptionsIds.h
index 2c1b5a16e4..83db4b651c 100644
--- a/src/mainboard/msi/ms7721/OptionsIds.h
+++ b/src/mainboard/msi/ms7721/OptionsIds.h
@@ -35,8 +35,6 @@
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
-//#undef IDSOPT_DEBUG_ENABLED
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT
diff --git a/src/mainboard/pcengines/apu1/OptionsIds.h b/src/mainboard/pcengines/apu1/OptionsIds.h
index ce3a8a0170..a8d9b0dcb4 100644
--- a/src/mainboard/pcengines/apu1/OptionsIds.h
+++ b/src/mainboard/pcengines/apu1/OptionsIds.h
@@ -33,7 +33,6 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_ASSERT_ENABLED  TRUE
 
-//#define IDSOPT_DEBUG_ENABLED  FALSE
 //#undef IDSOPT_HOST_SIMNOW
 //#define IDSOPT_HOST_SIMNOW    FALSE
 //#undef IDSOPT_HOST_HDT