14 files changed, 14 insertions, 126 deletions

diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index b575e02970..64ae59b6b9 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/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
 
@@ -84,14 +84,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/google/beltino/cmos.layout b/src/mainboard/google/beltino/cmos.layout
index b575e02970..64ae59b6b9 100644
--- a/src/mainboard/google/beltino/cmos.layout
+++ b/src/mainboard/google/beltino/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
 
@@ -84,14 +84,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/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index 180751d971..29fe11f77a 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -48,7 +48,7 @@ entries
 # -----------------------------------------------------------------
 # coreboot config options: console
 # No serial port on this motherboard
-#392          3       e       5        baud_rate
+#392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
 
@@ -92,14 +92,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/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout
index 91a1336104..e22c6ab3d0 100644
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -70,7 +70,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
 
@@ -107,14 +107,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/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index ae46e10647..0a1cb4810a 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -70,7 +70,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
 
@@ -107,14 +107,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/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index 91a1336104..e22c6ab3d0 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -70,7 +70,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
 
@@ -107,14 +107,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/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index c508d64ebe..e5866a9422 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -69,7 +69,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
 
@@ -106,14 +106,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/google/kahlee/cmos.layout b/src/mainboard/google/kahlee/cmos.layout
index b00693dcc2..b9b67ddaeb 100644
--- a/src/mainboard/google/kahlee/cmos.layout
+++ b/src/mainboard/google/kahlee/cmos.layout
@@ -43,7 +43,7 @@ entries
 384          1       e       4        boot_option
 386          1       e       1        ECC_memory
 388          4       h       0        reboot_counter
-392          3       e       5        baud_rate
+#392          3       e       5        unused
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
@@ -74,14 +74,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/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout
index 1c166c6756..e01c96469d 100644
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -70,7 +70,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
 
@@ -107,14 +107,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/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index 91dc89017a..d1015851bc 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/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
 
@@ -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/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index 91dc89017a..d1015851bc 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/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
 
@@ -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/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index b575e02970..64ae59b6b9 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/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
 
@@ -84,14 +84,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/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index b575e02970..64ae59b6b9 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/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
 
@@ -84,14 +84,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/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index 91dc89017a..d1015851bc 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/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
 
@@ -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