summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/auron/Kconfig10
-rw-r--r--src/mainboard/google/beltino/Kconfig9
-rw-r--r--src/mainboard/google/cheza/Kconfig5
-rw-r--r--src/mainboard/google/cyan/Kconfig15
-rw-r--r--src/mainboard/google/daisy/Kconfig4
-rw-r--r--src/mainboard/google/dragonegg/Kconfig5
-rw-r--r--src/mainboard/google/drallion/Kconfig7
-rw-r--r--src/mainboard/google/eve/Kconfig5
-rw-r--r--src/mainboard/google/fizz/Kconfig6
-rw-r--r--src/mainboard/google/foster/Kconfig5
-rw-r--r--src/mainboard/google/gale/Kconfig5
-rw-r--r--src/mainboard/google/glados/Kconfig11
-rw-r--r--src/mainboard/google/gru/Kconfig10
-rw-r--r--src/mainboard/google/hatch/Kconfig10
-rw-r--r--src/mainboard/google/jecht/Kconfig8
-rw-r--r--src/mainboard/google/kahlee/Kconfig9
-rw-r--r--src/mainboard/google/kukui/Kconfig9
-rw-r--r--src/mainboard/google/link/Kconfig5
-rw-r--r--src/mainboard/google/mistral/Kconfig5
-rw-r--r--src/mainboard/google/nyan/Kconfig4
-rw-r--r--src/mainboard/google/nyan_big/Kconfig4
-rw-r--r--src/mainboard/google/nyan_blaze/Kconfig4
-rw-r--r--src/mainboard/google/oak/Kconfig7
-rw-r--r--src/mainboard/google/octopus/Kconfig14
-rw-r--r--src/mainboard/google/peach_pit/Kconfig4
-rw-r--r--src/mainboard/google/poppy/Kconfig11
-rw-r--r--src/mainboard/google/rambi/Kconfig20
-rw-r--r--src/mainboard/google/reef/Kconfig10
-rw-r--r--src/mainboard/google/sarien/Kconfig6
-rw-r--r--src/mainboard/google/slippy/Kconfig8
-rw-r--r--src/mainboard/google/smaug/Kconfig4
-rw-r--r--src/mainboard/google/storm/Kconfig4
-rw-r--r--src/mainboard/google/urara/Kconfig5
-rw-r--r--src/mainboard/google/veyron/Kconfig9
-rw-r--r--src/mainboard/google/veyron_mickey/Kconfig5
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig4
-rw-r--r--src/mainboard/intel/glkrvp/Kconfig5
-rw-r--r--src/mainboard/intel/kblrvp/Kconfig5
-rw-r--r--src/mainboard/intel/kunimitsu/Kconfig5
-rw-r--r--src/mainboard/intel/strago/Kconfig5
40 files changed, 0 insertions, 286 deletions
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 69b086fefe..171418e4fa 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -45,16 +45,6 @@ config MAINBOARD_PART_NUMBER
default "Lulu" if BOARD_GOOGLE_LULU
default "Samus" if BOARD_GOOGLE_SAMUS
-config GBB_HWID
- string
- depends on CHROMEOS
- default "PAINE TEST A-A 8843" if BOARD_GOOGLE_AURON_PAINE
- default "YUNA TEST A-A 3347" if BOARD_GOOGLE_AURON_YUNA
- default "BUDDY TEST A-A 6186" if BOARD_GOOGLE_BUDDY
- default "GANDOF TEST A-A 7705" if BOARD_GOOGLE_GANDOF
- default "LULU TEST A-A 7705" if BOARD_GOOGLE_LULU
- default "SAMUS TEST 8028" if BOARD_GOOGLE_SAMUS
-
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index df5da9df20..9de141f539 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -42,15 +42,6 @@ config MAINBOARD_FAMILY
string
default "Google_Beltino"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "X86 MCCLOUD TEST 5268" if BOARD_GOOGLE_MCCLOUD
- default "X86 MONROE TEST 9962" if BOARD_GOOGLE_MONROE
- default "X86 PANTHER TEST 6287" if BOARD_GOOGLE_PANTHER
- default "X86 TRICKY TEST 4487" if BOARD_GOOGLE_TRICKY
- default "X86 ZAKO TEST 8602" if BOARD_GOOGLE_ZAKO
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/cheza/Kconfig b/src/mainboard/google/cheza/Kconfig
index 59f78a8e56..ce69fe07e7 100644
--- a/src/mainboard/google/cheza/Kconfig
+++ b/src/mainboard/google/cheza/Kconfig
@@ -47,9 +47,4 @@ config MAINBOARD_PART_NUMBER
string
default "Cheza" if BOARD_GOOGLE_CHEZA
-config GBB_HWID
- string
- depends on CHROMEOS
- default "CHEZA TEST 1859" if BOARD_GOOGLE_CHEZA
-
endif # BOARD_GOOGLE_CHEZA_COMMON
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index bf0cd095f7..6f830b208e 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -93,21 +93,6 @@ config VGA_BIOS_ID
The VGA_BIOS_ID for the C0 version of the video bios is hardcoded
in soc/intel/braswell/Makefile.inc as 8086,22b1
-config GBB_HWID
- string
- depends on CHROMEOS
- default "BANON TEST A-A 8050" if BOARD_GOOGLE_BANON
- default "CELES TEST A-A 5441" if BOARD_GOOGLE_CELES
- default "CYAN TEST A-A 1829" if BOARD_GOOGLE_CYAN
- default "EDGAR TEST A-A 2507" if BOARD_GOOGLE_EDGAR
- default "KEFKA TEST A-A 5397" if BOARD_GOOGLE_KEFKA
- default "REKS TEST A-A 3004" if BOARD_GOOGLE_REKS
- default "RELM TEST A-A 2323" if BOARD_GOOGLE_RELM
- default "SETZER TEST A-A 8721" if BOARD_GOOGLE_SETZER
- default "TERRA TEST A-A 1650" if BOARD_GOOGLE_TERRA
- default "ULTIMA TEST A-A 6017" if BOARD_GOOGLE_ULTIMA
- default "WIZPIG TEST A-A 0597" if BOARD_GOOGLE_WIZPIG
-
config CBFS_SIZE
hex
default 0x200000
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index 55e0978ab7..ec09d5e199 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -58,8 +58,4 @@ config UART_FOR_CONSOLE
int
default 3
-config GBB_HWID
- string
- depends on CHROMEOS
- default "DAISY TEST A-A 9382"
endif # BOARD_GOOGLE_DAISY
diff --git a/src/mainboard/google/dragonegg/Kconfig b/src/mainboard/google/dragonegg/Kconfig
index 39228f45a9..dc6146c18b 100644
--- a/src/mainboard/google/dragonegg/Kconfig
+++ b/src/mainboard/google/dragonegg/Kconfig
@@ -38,11 +38,6 @@ config DRIVER_TPM_SPI_BUS
depends on DRAGONEGG_USE_SPI_TPM
default 0x1
-config GBB_HWID
- string
- depends on CHROMEOS
- default "DRAGONEGG TEST 1394"
-
config MAINBOARD_DIR
string
default "google/dragonegg"
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 97d0b51a8d..35f7150836 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -58,13 +58,6 @@ config POWER_OFF_ON_CR50_UPDATE
bool
default n
-config GBB_HWID
- string
- depends on CHROMEOS
- default "ARCADACML TEST 2699" if BOARD_GOOGLE_ARCADA_CML
- default "SARIENCML TEST 3111" if BOARD_GOOGLE_SARIEN_CML
- default "DRALLION TEST 4932" if BOARD_GOOGLE_DRALLION
-
config MAINBOARD_DIR
string
default "google/drallion"
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index 022493c35f..e646f23d26 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -44,11 +44,6 @@ config TPM_TIS_ACPI_INTERRUPT
int
default 64 # GPE0_DW2_00 (GPP_E0)
-config GBB_HWID
- string
- depends on CHROMEOS
- default "EVE TEST 1394"
-
config IRQ_SLOT_COUNT
int
default 18
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index b05cb6c16d..44ac064bd1 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -44,12 +44,6 @@ config VBOOT
config DRIVER_TPM_SPI_BUS
default 0x1
-config GBB_HWID
- string
- depends on CHROMEOS
- default "FIZZ TEST 5997" if BOARD_GOOGLE_FIZZ
- default "KARMA TEST 5022" if BOARD_GOOGLE_KARMA
-
config MAINBOARD_DIR
string
default "google/fizz"
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index f3e7808208..6157519434 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -80,11 +80,6 @@ config DRIVER_TPM_I2C_ADDR
# string
# default "nyan"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "FOSTER TEST 1184"
-
config VBOOT_FWID_MODEL
string
default "Nvidia_Foster"
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index f8def87ca2..5e00be0ef4 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -48,11 +48,6 @@ config MAINBOARD_PART_NUMBER
default "DK01" if BOARD_VARIANT_DK01
default "Gale"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "Gale TEST 1"
-
config DRAM_SIZE_MB
int
default 512 if BOARD_VARIANT_DK01
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index b75b726dc1..8e48dc710f 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -87,17 +87,6 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME
default "glados_pd" if BOARD_GOOGLE_GLADOS
default ""
-config GBB_HWID
- string
- depends on CHROMEOS
- default "ASUKA TEST 2547" if BOARD_GOOGLE_ASUKA
- default "CAROLINE TEST 0958" if BOARD_GOOGLE_CAROLINE
- default "CAVE TEST 9629" if BOARD_GOOGLE_CAVE
- default "CHELL TEST 6297" if BOARD_GOOGLE_CHELL
- default "GLADOS TEST 1988" if BOARD_GOOGLE_GLADOS
- default "LARS TEST 5001" if BOARD_GOOGLE_LARS
- default "SENTRY TEST 6297" if BOARD_GOOGLE_SENTRY
-
config UART_FOR_CONSOLE
int
default 2
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 49944a855e..e7db1858db 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -115,14 +115,4 @@ config MAINBOARD_PART_NUMBER
default "Nefario" if BOARD_GOOGLE_NEFARIO
default "Rainier" if BOARD_GOOGLE_RAINIER
-config GBB_HWID
- string
- depends on CHROMEOS
- default "SCARLET TEST 7598" if BOARD_GOOGLE_SCARLET
- default "BOB TEST 7422" if BOARD_GOOGLE_BOB
- default "GRU TEST 5431" if BOARD_GOOGLE_GRU
- default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN
- default "NEFARIO TEST 3735" if BOARD_GOOGLE_NEFARIO
- default "RAINIER TEST 9752" if BOARD_GOOGLE_RAINIER
-
endif # BOARD_GOOGLE_GRU_COMMON
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index d4cf83dfe9..8bb0207e19 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -69,16 +69,6 @@ config FMDFILE
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-16MiB.fmd" if BOARD_ROMSIZE_KB_16384
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_32768
-config GBB_HWID
- string
- depends on CHROMEOS
- default "AKEMI TEST 4326" if BOARD_GOOGLE_AKEMI
- default "DRATINI TEST 4583" if BOARD_GOOGLE_DRATINI
- default "HATCH TEST 1823" if BOARD_GOOGLE_HATCH
- default "HELIOS TEST 0878" if BOARD_GOOGLE_HELIOS
- default "KINDRED TEST 2636" if BOARD_GOOGLE_KINDRED
- default "KOHAKU TEST 1953" if BOARD_GOOGLE_KOHAKU
-
config MAINBOARD_DIR
string
default "google/hatch"
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 5ffc1bc435..041ffcebc8 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -37,14 +37,6 @@ config MAINBOARD_PART_NUMBER
default "Rikku" if BOARD_GOOGLE_RIKKU
default "Tidus" if BOARD_GOOGLE_TIDUS
-config GBB_HWID
- string
- depends on CHROMEOS
- default "GUADO TEST A-A 7416" if BOARD_GOOGLE_GUADO
- default "JECHT TEST A-A 8958" if BOARD_GOOGLE_JECHT
- default "RIKKU TEST A-A 0702" if BOARD_GOOGLE_RIKKU
- default "TIDUS TEST A-A 0595" if BOARD_GOOGLE_TIDUS
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index b675f33fc5..a83b07a6b7 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -110,15 +110,6 @@ config VBOOT_VBNV_OFFSET
config CHROMEOS
select LP_DEFCONFIG_OVERRIDE if PAYLOAD_DEPTHCHARGE
-config GBB_HWID
- string
- depends on CHROMEOS
- default "ALEENA TEST 7281" if BOARD_GOOGLE_ALEENA
- default "CAREENA TEST 8777" if BOARD_GOOGLE_CAREENA
- default "GRUNT TEST 8296" if BOARD_GOOGLE_GRUNT
- default "LIARA TEST 0464" if BOARD_GOOGLE_LIARA
- default "TREEYA TEST 0307" if BOARD_GOOGLE_TREEYA
-
config AMD_FWM_POSITION_INDEX
int
default 1
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index 282891846b..542ee108a7 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -70,13 +70,4 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
hex
default 0x2
-config GBB_HWID
- string
- depends on CHROMEOS
- default "KUKUI TEST 9847" if BOARD_GOOGLE_KUKUI
- default "KRANE TEST 5417" if BOARD_GOOGLE_KRANE
- default "KODAMA TEST 7122" if BOARD_GOOGLE_KODAMA
- default "FLAPJACK TEST 4147" if BOARD_GOOGLE_FLAPJACK
- default "JACUZZI TEST 6792" if BOARD_GOOGLE_JACUZZI
- default "JUNIPER TEST 4819" if BOARD_GOOGLE_JUNIPER
endif
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 6d62f64e3e..b7421900dc 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -39,11 +39,6 @@ config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "X86 LINK TEST 6638"
-
config MAINBOARD_SMBIOS_MANUFACTURER
string
default "GOOGLE"
diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig
index a2ba7cc24a..d6f9b169a3 100644
--- a/src/mainboard/google/mistral/Kconfig
+++ b/src/mainboard/google/mistral/Kconfig
@@ -36,9 +36,4 @@ config MAINBOARD_PART_NUMBER
string
default "Mistral" if BOARD_GOOGLE_MISTRAL
-config GBB_HWID
- string
- depends on CHROMEOS
- default "MISTRAL TEST 1859" if BOARD_GOOGLE_MISTRAL
-
endif # BOARD_GOOGLE_MISTRAL_COMMON
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 9f4720f583..5ad945e12d 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -79,8 +79,4 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x20
-config GBB_HWID
- string
- depends on CHROMEOS
- default "NYAN TEST 9382"
endif # BOARD_GOOGLE_NYAN
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 9a050c44a0..bef25577a9 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -81,8 +81,4 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x20
-config GBB_HWID
- string
- depends on CHROMEOS
- default "BIG TEST 9382"
endif # BOARD_GOOGLE_NYAN_BIG
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 1e91da9d9e..cb001538c9 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -81,8 +81,4 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x20
-config GBB_HWID
- string
- depends on CHROMEOS
- default "BLAZE TEST 9xxx"
endif # BOARD_GOOGLE_NYAN_BLAZE
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index c383fa4597..f943a4f437 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -90,13 +90,6 @@ config MAINBOARD_PART_NUMBER
default "Elm" if BOARD_GOOGLE_ELM
default "Hana" if BOARD_GOOGLE_HANA
-config GBB_HWID
- string
- depends on CHROMEOS
- default "OAK TEST 6858" if BOARD_GOOGLE_OAK
- default "ELM TEST 3839" if BOARD_GOOGLE_ELM
- default "HANA TEST 5855" if BOARD_GOOGLE_HANA
-
# All Oak-derivatives count their board IDs as 0 being equivalent to Oak rev6.
config BOARD_ID_ADJUSTMENT
int
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 8ca9251cfc..81204188b1 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -86,20 +86,6 @@ config MAINBOARD_FAMILY
string
default "Google_Octopus"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "YORP TEST 7755" if BOARD_GOOGLE_YORP
- default "PHASER TEST 7167" if BOARD_GOOGLE_PHASER
- default "FLEEX TEST 7423" if BOARD_GOOGLE_FLEEX
- default "BOBBA TEST 4516" if BOARD_GOOGLE_BOBBA
- default "MEEP TEST 1118" if BOARD_GOOGLE_MEEP
- default "AMPTON TEST 1285" if BOARD_GOOGLE_AMPTON
- default "CASTA TEST 8105" if BOARD_GOOGLE_CASTA
- default "BLOOG TEST 2509" if BOARD_GOOGLE_BLOOG
- default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS
- default "GARG TEST 1337" if BOARD_GOOGLE_GARG
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index 75f0f0a1e5..fc2ceb83ad 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -52,8 +52,4 @@ config UART_FOR_CONSOLE
int
default 3
-config GBB_HWID
- string
- depends on CHROMEOS
- default "PEACH TEST A-A 9382"
endif # BOARD_GOOGLE_PEACH_PIT
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index fda8c9e8b8..91de9a8c71 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -47,17 +47,6 @@ config DRIVER_TPM_SPI_BUS
depends on MAINBOARD_HAS_SPI_TPM_CR50
default 0x1
-config GBB_HWID
- string
- depends on CHROMEOS
- default "ATLAS TEST 1412" if BOARD_GOOGLE_ATLAS
- default "POPPY TEST 8294" if BOARD_GOOGLE_POPPY
- default "NAMI TEST 1669" if BOARD_GOOGLE_NAMI
- default "NAUTILUS TEST 3013" if BOARD_GOOGLE_NAUTILUS
- default "NOCTURNE TEST 3421" if BOARD_GOOGLE_NOCTURNE
- default "RAMMUS TEST 2130" if BOARD_GOOGLE_RAMMUS
- default "SORAKA TEST 1869" if BOARD_GOOGLE_SORAKA
-
config INCLUDE_NHLT_BLOBS
bool "Include blobs for audio."
select NHLT_DMIC_2CH
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 56d44bcea0..63e0d5676c 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -62,26 +62,6 @@ config MAINBOARD_PART_NUMBER
default "Swanky" if BOARD_GOOGLE_SWANKY
default "Winky" if BOARD_GOOGLE_WINKY
-config GBB_HWID
- string
- depends on CHROMEOS
- default "BANJO TEST A-A 8843" if BOARD_GOOGLE_BANJO
- default "CANDY TEST A-A 3347" if BOARD_GOOGLE_CANDY
- default "CLAPPER TEST A-A 7705" if BOARD_GOOGLE_CLAPPER
- default "ENGUARDE TEST A-A 0128" if BOARD_GOOGLE_ENGUARDE
- default "GLIMMER TEST 8028" if BOARD_GOOGLE_GLIMMER
- default "GNAWTY TEST A-A 3347" if BOARD_GOOGLE_GNAWTY
- default "HELI TEST A-A 7705" if BOARD_GOOGLE_HELI
- default "KIP TEST A-A 0128" if BOARD_GOOGLE_KIP
- default "NINJA TEST A-A 0653" if BOARD_GOOGLE_NINJA
- default "ORCO TEST 8028" if BOARD_GOOGLE_ORCO
- default "QUAWKS TEST A-A 3347" if BOARD_GOOGLE_QUAWKS
- default "RAMBI TEST A-A 0128" if BOARD_GOOGLE_RAMBI
- default "SQUAWKS TEST A-A 7705" if BOARD_GOOGLE_SQUAWKS
- default "SUMO TEST A-A 8843" if BOARD_GOOGLE_SUMO
- default "SWANKY TEST A-A 0653" if BOARD_GOOGLE_SWANKY
- default "WINKY TEST 0128" if BOARD_GOOGLE_WINKY
-
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index d2240a8397..520b78819f 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -81,16 +81,6 @@ config MAINBOARD_FAMILY
default "Google_Coral" if BOARD_GOOGLE_CORAL
default "Google_Reef"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "REEF TEST 3240" if BOARD_GOOGLE_REEF
- default "PYRO TEST 0290" if BOARD_GOOGLE_PYRO
- default "SAND TEST 1904" if BOARD_GOOGLE_SAND
- default "SNAPPY TEST 1088" if BOARD_GOOGLE_SNAPPY
- default "NASHER TEST 4258" if BOARD_GOOGLE_NASHER
- default "CORAL TEST 8594" if BOARD_GOOGLE_CORAL
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index e6d1f1f60f..455fbc205f 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -62,12 +62,6 @@ config POWER_OFF_ON_CR50_UPDATE
bool
default n
-config GBB_HWID
- string
- depends on CHROMEOS
- default "ARCADA TEST 3556" if BOARD_GOOGLE_ARCADA
- default "SARIEN TEST 2787" if BOARD_GOOGLE_SARIEN
-
config MAINBOARD_DIR
string
default "google/sarien"
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 35fced0231..68b92bb3f3 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -47,14 +47,6 @@ config MAINBOARD_FAMILY
string
default "Google_Slippy"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "X86 FALCO TEST 0289" if BOARD_GOOGLE_FALCO
- default "X86 LEON TEST 5181" if BOARD_GOOGLE_LEON
- default "X86 PEPPY TEST 4211" if BOARD_GOOGLE_PEPPY
- default "X86 WOLF TEST 6457" if BOARD_GOOGLE_WOLF
-
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 8a2927bbb4..2b9be0262a 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -86,8 +86,4 @@ config EC_GOOGLE_CHROMEEC_I2C_BUS
hex
default 0x1
-config GBB_HWID
- string
- depends on CHROMEOS
- default "SMAUG TEST 2906"
endif # BOARD_GOOGLE_SMAUG
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index e6240747cc..3abea56c86 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -59,8 +59,4 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x20
-config GBB_HWID
- string
- depends on CHROMEOS
- default "Storm TEST 1"
endif # BOARD_GOOGLE_STORM
diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig
index 19d5c41795..3cbe7ed5f9 100644
--- a/src/mainboard/google/urara/Kconfig
+++ b/src/mainboard/google/urara/Kconfig
@@ -52,9 +52,4 @@ config CONSOLE_SERIAL_UART_ADDRESS
config BOOT_DEVICE_SPI_FLASH_BUS
int
default 1
-
-config GBB_HWID
- string
- depends on CHROMEOS
- default "Urara TEST 1"
endif
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 9c126fd765..8e29661929 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -105,13 +105,4 @@ config EC_GOOGLE_CHROMEEC_BOARDNAME
#default "minnie" if BOARD_GOOGLE_VEYRON_MINNIE
#default "speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
-config GBB_HWID
- string
- depends on CHROMEOS
- default "JAQ TEST A-A 8292" if BOARD_GOOGLE_VEYRON_JAQ
- default "JERRY TEST A-A 1250" if BOARD_GOOGLE_VEYRON_JERRY
- default "MIGHTY TEST A-A 4557" if BOARD_GOOGLE_VEYRON_MIGHTY
- default "MINNIE TEST A-A 5151" if BOARD_GOOGLE_VEYRON_MINNIE
- default "SPEEDY TEST A-A 8421" if BOARD_GOOGLE_VEYRON_SPEEDY
-
endif # BOARD_GOOGLE_VEYRON
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 46bc0de7e6..876d70ea2b 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -63,9 +63,4 @@ config PMIC_BUS
int
default 0
-config GBB_HWID
- string
- depends on CHROMEOS
- default "MICKEY TEST A-A 0352"
-
endif # BOARD_GOOGLE_VEYRON_MICKEY
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 189f010a96..4550c5b822 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -63,8 +63,4 @@ config PMIC_BUS
int
default 0
-config GBB_HWID
- string
- depends on CHROMEOS
- default "RIALTO TEST A-A 2322"
endif # BOARD_GOOGLE_VEYRON_RIALTO
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 920b446aad..f10a9f0fa4 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -68,11 +68,6 @@ config MAINBOARD_FAMILY
string
default "Intel_Glkrvp" if BOARD_INTEL_GLKRVP
-config GBB_HWID
- string
- depends on CHROMEOS
- default "GLKRVP TEST A-A 6939" if BOARD_INTEL_GLKRVP
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index c0737cbce6..afc510fe4e 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -51,11 +51,6 @@ config TPM_PIRQ
hex
default 0x18 # GPP_E0_IRQ
-config GBB_HWID
- string
- depends on CHROMEOS
- default "KBLRVP TEST 8819"
-
config DEVICETREE
string
default "variants/baseboard/devicetree.cb"
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index f4dd4b1057..63961513b9 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -69,11 +69,6 @@ config INCLUDE_NHLT_BLOBS
select NHLT_NAU88L25
select NHLT_SSM4567
-config GBB_HWID
- string
- depends on CHROMEOS
- default "KUNIMITSU TEST 8819"
-
config UART_FOR_CONSOLE
int
default 2
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index da04d78a05..1f6a73d474 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -54,11 +54,6 @@ config EC_GOOGLE_CHROMEEC_BOARDNAME
string
default "strago"
-config GBB_HWID
- string
- depends on CHROMEOS
- default "STRAGO TEST A-A 9657"
-
config CBFS_SIZE
hex
default 0x200000