mb/google: Update/add ChromeOS device marketing names

Commit c09c2a4 [mb/google: Add Chromebook marketing names] added
marketing names for many ChromeOS devices; add some that were left out,
correct some errors, and try to format model names/numbers consistently 
(or as consistently as the manufacturers allow).

Change-Id: Ia13858e2e6ba7d7e025f25fad33e6338250498e5
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/22520
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

7 files changed, 18 insertions, 18 deletions

diff --git a/src/mainboard/google/auron/Kconfig.name b/src/mainboard/google/auron/Kconfig.name
index 9916a9129e..58fb0cb1bd 100644
--- a/src/mainboard/google/auron/Kconfig.name
+++ b/src/mainboard/google/auron/Kconfig.name
@@ -1,13 +1,13 @@
 config BOARD_GOOGLE_AURON_PAINE
-	bool "Auron_Paine (Acer C670 Chromebook 11)"
+	bool "Auron_Paine (Acer C740 Chromebook)"
 	select BOARD_GOOGLE_BASEBOARD_AURON
 
 config BOARD_GOOGLE_AURON_YUNA
-	bool "Auron_Yuna (Acer Chromebook 15)"
+	bool "Auron_Yuna (Acer Chromebook 15 (C910/CB5-531))"
 	select BOARD_GOOGLE_BASEBOARD_AURON
 
 config BOARD_GOOGLE_GANDOF
-	bool "Gandof (Toshiba Chromebook 2 (2015 Edition))"
+	bool "Gandof (Toshiba Chromebook 2 (2015))"
 	select BOARD_GOOGLE_BASEBOARD_AURON
 
 config BOARD_GOOGLE_LULU
diff --git a/src/mainboard/google/beltino/Kconfig.name b/src/mainboard/google/beltino/Kconfig.name
index a19183fe1b..f7348c6219 100644
--- a/src/mainboard/google/beltino/Kconfig.name
+++ b/src/mainboard/google/beltino/Kconfig.name
@@ -1,5 +1,5 @@
 config BOARD_GOOGLE_MCCLOUD
-	bool "Mccloud (Acer Chromebox)"
+	bool "Mccloud (Acer Chromebox CXI)"
 	select BOARD_GOOGLE_BASEBOARD_BELTINO
 
 config BOARD_GOOGLE_MONROE
@@ -11,7 +11,7 @@ config BOARD_GOOGLE_PANTHER
 	select BOARD_GOOGLE_BASEBOARD_BELTINO
 
 config BOARD_GOOGLE_TRICKY
-	bool "Tricky (Dell Chromebox)"
+	bool "Tricky (Dell Chromebox 3010)"
 	select BOARD_GOOGLE_BASEBOARD_BELTINO
 
 config BOARD_GOOGLE_ZAKO
diff --git a/src/mainboard/google/cyan/Kconfig.name b/src/mainboard/google/cyan/Kconfig.name
index ab7d2b282c..184d1594ac 100644
--- a/src/mainboard/google/cyan/Kconfig.name
+++ b/src/mainboard/google/cyan/Kconfig.name
@@ -1,5 +1,5 @@
 config BOARD_GOOGLE_BANON
-	bool "Banon (Acer 15.6\" Chromebook)"
+	bool "Banon (Acer Chromebook 15 (CB3-532))"
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_CELES
@@ -7,7 +7,7 @@ config BOARD_GOOGLE_CELES
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_CYAN
-	bool "Cyan (Acer Chromebook R11)"
+	bool "Cyan (Acer Chromebook R11 (C738T))"
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_EDGAR
@@ -15,11 +15,11 @@ config BOARD_GOOGLE_EDGAR
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_KEFKA
-	bool "Kefka (Dell Chromebook 11 Model 3180)"
+	bool "Kefka (Dell Chromebook 11 3180/3189)"
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_REKS
-	bool "Reks (Lenovo Chromebook 11)"
+	bool "Reks (Lenovo N22/N42 Chromebook)"
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_RELM
@@ -31,7 +31,7 @@ config BOARD_GOOGLE_SETZER
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_TERRA
-	bool "Terra (ASUS Chromebook C202SA/C300SA)"
+	bool "Terra (ASUS Chromebook C202SA/C300SA/C301SA)"
 	select BOARD_GOOGLE_BASEBOARD_CYAN
 
 config BOARD_GOOGLE_ULTIMA
diff --git a/src/mainboard/google/lars/Kconfig.name b/src/mainboard/google/lars/Kconfig.name
index 311e303e97..8ab492310a 100644
--- a/src/mainboard/google/lars/Kconfig.name
+++ b/src/mainboard/google/lars/Kconfig.name
@@ -1,2 +1,2 @@
 config BOARD_GOOGLE_LARS
-	bool "Lars (Chromebook 14 for work (CP5-471))"
+	bool "Lars (Acer Chromebook 14 for Work (CP5-471))"
diff --git a/src/mainboard/google/parrot/Kconfig.name b/src/mainboard/google/parrot/Kconfig.name
index 2a38804aa1..1dd07e659b 100644
--- a/src/mainboard/google/parrot/Kconfig.name
+++ b/src/mainboard/google/parrot/Kconfig.name
@@ -1,2 +1,2 @@
 config BOARD_GOOGLE_PARROT
-	bool "Parrot (Acer C7 710 Chromebook)"
+	bool "Parrot (Acer C7/C710 Chromebook)"
diff --git a/src/mainboard/google/rambi/Kconfig.name b/src/mainboard/google/rambi/Kconfig.name
index 88627ba2f2..36c35c705b 100644
--- a/src/mainboard/google/rambi/Kconfig.name
+++ b/src/mainboard/google/rambi/Kconfig.name
@@ -1,9 +1,9 @@
 config BOARD_GOOGLE_BANJO
-	bool "Banjo (Acer Chromebook 15.6\" (CB3-531))"
+	bool "Banjo (Acer Chromebook 15 (CB3-531))"
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_CANDY
-	bool "Candy (Dell Chromebook 11 (3120))"
+	bool "Candy (Dell Chromebook 11 3120)"
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_CLAPPER
@@ -19,11 +19,11 @@ config BOARD_GOOGLE_GLIMMER
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_GNAWTY
-	bool "Gnawty (Acer Chromebook 11 (C730/C730E/C735))"
+	bool "Gnawty (Acer Chromebook 11 (CB3-111/131,C730/C730E/C735))"
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_HELI
-	bool "Heli"
+	bool "Heli (Haier Chromebook G2)"
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_KIP
@@ -59,5 +59,5 @@ config BOARD_GOOGLE_SWANKY
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_WINKY
-	bool "Winky (Samsung Chromebook 2 11 - XE500C12)"
+	bool "Winky (Samsung Chromebook 2 (XE500C12))"
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
diff --git a/src/mainboard/google/slippy/Kconfig.name b/src/mainboard/google/slippy/Kconfig.name
index 08e6b9ae56..cf1d664ab6 100644
--- a/src/mainboard/google/slippy/Kconfig.name
+++ b/src/mainboard/google/slippy/Kconfig.name
@@ -7,7 +7,7 @@ config BOARD_GOOGLE_LEON
 	select BOARD_GOOGLE_BASEBOARD_SLIPPY
 
 config BOARD_GOOGLE_PEPPY
-	bool "Peppy (Acer C720/C720P/C740 Chromebook)"
+	bool "Peppy (Acer C720/C720P Chromebook)"
 	select BOARD_GOOGLE_BASEBOARD_SLIPPY
 
 config BOARD_GOOGLE_WOLF