14 files changed, 9 insertions, 86 deletions

diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default
index 9a47cf9549..d269afcb6d 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default
@@ -1,5 +1,4 @@
 boot_option=Fallback
-baud_rate=115200
 debug_level=Spew
 hyper_threading=Enable
 nmi=Enable
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
index 47f48ddffb..7ff7d92123 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
@@ -47,7 +47,7 @@ entries
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-392          3       e       5        baud_rate
+#392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
 
@@ -88,14 +88,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     1     Emergency
 6     2     Alert
 6     3     Critical
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
index 767372cd23..a313f681cc 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default
@@ -1,5 +1,4 @@
 boot_option=Fallback
-baud_rate=115200
 debug_level=Spew
 power_on_after_fail=Enable
 nmi=Enable
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index 5600a6b635..72569b2c27 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -48,7 +48,7 @@ entries
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-392          3       e       5        baud_rate
+#392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
 
@@ -89,14 +89,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     1     Emergency
 6     2     Alert
 6     3     Critical
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
index 767372cd23..a313f681cc 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default
@@ -1,5 +1,4 @@
 boot_option=Fallback
-baud_rate=115200
 debug_level=Spew
 power_on_after_fail=Enable
 nmi=Enable
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
index 5600a6b635..72569b2c27 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -48,7 +48,7 @@ entries
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-392          3       e       5        baud_rate
+#392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
 
@@ -89,14 +89,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     1     Emergency
 6     2     Alert
 6     3     Critical
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default
index 303c4c29b7..8d844bda4f 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default
@@ -1,5 +1,4 @@
 boot_option=Fallback
-baud_rate=115200
 debug_level=Spew
 power_on_after_fail=Enable
 nmi=Enable
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
index fac9d3594d..f5f309c66a 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -48,7 +48,7 @@ entries
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-392          3       e       5        baud_rate
+#392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
 
@@ -80,14 +80,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     1     Emergency
 6     2     Alert
 6     3     Critical
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index a6d7a6e810..f4268101a6 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#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
@@ -47,14 +47,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     6     Notice
 6     7     Info
 6     8     Debug
diff --git a/src/mainboard/gigabyte/m57sli/cmos.default b/src/mainboard/gigabyte/m57sli/cmos.default
index 2514fa0ae7..62068cf4a7 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.default
+++ b/src/mainboard/gigabyte/m57sli/cmos.default
@@ -1,4 +1,3 @@
-baud_rate = 115200
 debug_level = Spew
 multi_core = Enable
 slow_cpu = off
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index a6d7a6e810..f4268101a6 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#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
@@ -47,14 +47,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     6     Notice
 6     7     Info
 6     8     Debug
diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout
index aca27b0779..1d957dc98e 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -3,7 +3,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#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
@@ -30,14 +30,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     6     Notice
 6     7     Info
 6     8     Debug
diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout
index aca27b0779..1d957dc98e 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -3,7 +3,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#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
@@ -30,14 +30,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     6     Notice
 6     7     Info
 6     8     Debug
diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout
index aca27b0779..1d957dc98e 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -3,7 +3,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#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
@@ -30,14 +30,6 @@ enumerations
 2     1     Disable
 4     0     Fallback
 4     1     Normal
-5     0     115200
-5     1     57600
-5     2     38400
-5     3     19200
-5     4     9600
-5     5     4800
-5     6     2400
-5     7     1200
 6     6     Notice
 6     7     Info
 6     8     Debug