From 0aa1f9e9052affefe90880f6d9f9738d18fc78b4 Mon Sep 17 00:00:00 2001 From: Evan Green Date: Tue, 26 Mar 2019 11:37:30 -0700 Subject: google/oak: Delete rowan Rowan board is dead, dissect it out of Oak. Signed-off-by: Evan Green BUG=chromium:840888 BRANCH=none TEST=emerge-oak coreboot chromeos-bootimage CQ-DEPEND=CL:1538915,CL:*1087044 Change-Id: Ifb19fa0cd814853270847bc14fc21c841d905146 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32061 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/mainboard/google/oak/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mainboard/google/oak/Kconfig') diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index b770944a36..c383fa4597 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -20,13 +20,12 @@ if BOARD_GOOGLE_OAK_COMMON config OTHERS_HAVE_TPM1 bool - default y if !BOARD_GOOGLE_ROWAN + default y select MAINBOARD_HAS_I2C_TPM_GENERIC select MAINBOARD_HAS_TPM1 config OAK_HAS_TPM2 bool - default y if BOARD_GOOGLE_ROWAN default n select MAINBOARD_HAS_I2C_TPM_CR50 select MAINBOARD_HAS_TPM2 @@ -90,7 +89,6 @@ config MAINBOARD_PART_NUMBER default "Oak" if BOARD_GOOGLE_OAK default "Elm" if BOARD_GOOGLE_ELM default "Hana" if BOARD_GOOGLE_HANA - default "Rowan" if BOARD_GOOGLE_ROWAN config GBB_HWID string @@ -98,7 +96,6 @@ config GBB_HWID default "OAK TEST 6858" if BOARD_GOOGLE_OAK default "ELM TEST 3839" if BOARD_GOOGLE_ELM default "HANA TEST 5855" if BOARD_GOOGLE_HANA - default "ROWAN TEST 9387" if BOARD_GOOGLE_ROWAN # All Oak-derivatives count their board IDs as 0 being equivalent to Oak rev6. config BOARD_ID_ADJUSTMENT @@ -106,6 +103,5 @@ config BOARD_ID_ADJUSTMENT default 0 if BOARD_GOOGLE_OAK default 7 if BOARD_GOOGLE_ELM default 11 if BOARD_GOOGLE_HANA - default 15 if BOARD_GOOGLE_ROWAN endif # BOARD_GOOGLE_OAK -- cgit v1.2.3