diff options
| author | Martin Roth <martinroth@google.com> | 2018-06-02 21:30:21 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-11 08:41:44 +0000 |
| commit | b250b2349f221ec2e57ba08aa987c53214f21800 (patch) | |
| tree | 6042c80c47079e55512d1de3088b66d4922bc7fb /src/mainboard/google/kahlee/Kconfig | |
| parent | b4cf849333bccf7f003e7860c312b497020f3a31 (diff) | |
mainboard/google/kahlee: Remove Kahlee variant
This code is no longer needed. Removing Kahlee options allows some
Kconfig options to be optimized.
BUG=b:77693343
TEST=Build Grunt, verify that nothing's changed.
Change-Id: I4eeeee7f35381bba8760c8a530251c475d0ee29b
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/26777
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google/kahlee/Kconfig')
| -rw-r--r-- | src/mainboard/google/kahlee/Kconfig | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index d1e4877cc8..f5ae3fb13b 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -18,8 +18,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE select SOC_AMD_STONEYRIDGE_FT4 select ALWAYS_LOAD_OPROM select ALWAYS_RUN_OPROM - select BOARD_ROMSIZE_KB_8192 if BOARD_GOOGLE_KAHLEE - select BOARD_ROMSIZE_KB_16384 if !BOARD_GOOGLE_KAHLEE + select BOARD_ROMSIZE_KB_16384 select DRIVERS_I2C_GENERIC select DRIVERS_PS2_KEYBOARD select EC_GOOGLE_CHROMEEC @@ -35,7 +34,12 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE select SOC_AMD_PSP_SELECTABLE_SMU_FW select SOC_AMD_SMU_FANLESS select HAVE_ACPI_RESUME - select DRIVERS_GENERIC_BH720 if !BOARD_GOOGLE_KAHLEE + select DRIVERS_GENERIC_BH720 + select MAINBOARD_HAS_I2C_TPM_CR50 + select MAINBOARD_HAS_TPM2 + select DRIVERS_GENERIC_ADAU7002 + select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_BASEBOARD_KAHLEE @@ -47,13 +51,11 @@ config VARIANT_DIR string default "careena" if BOARD_GOOGLE_CAREENA default "grunt" if BOARD_GOOGLE_GRUNT - default "kahlee" if BOARD_GOOGLE_KAHLEE config MAINBOARD_PART_NUMBER string default "Careena" if BOARD_GOOGLE_CAREENA default "Grunt" if BOARD_GOOGLE_GRUNT - default "Kahlee" if BOARD_GOOGLE_KAHLEE config DEVICETREE string @@ -65,7 +67,6 @@ config MAINBOARD_FAMILY config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS && BOARD_GOOGLE_KAHLEE default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS default "" help @@ -101,7 +102,6 @@ config GBB_HWID depends on CHROMEOS default "CAREENA TEST 8777" if BOARD_GOOGLE_CAREENA default "GRUNT TEST 8296" if BOARD_GOOGLE_GRUNT - default "KAHLEE TEST 6421" if BOARD_GOOGLE_KAHLEE config AMD_FWM_POSITION_INDEX int @@ -109,31 +109,10 @@ config AMD_FWM_POSITION_INDEX config DRIVER_TPM_I2C_BUS hex - depends on I2C_TPM default 0x01 config DRIVER_TPM_I2C_ADDR hex - depends on I2C_TPM default 0x50 -config GRUNT_AUDIO - bool - default y if !BOARD_GOOGLE_KAHLEE - select DRIVERS_GENERIC_ADAU7002 - select DRIVERS_GENERIC_MAX98357A - select DRIVERS_I2C_DA7219 - -config GRUNT_TPM - bool - default y if BOARD_GOOGLE_GRUNT - select MAINBOARD_HAS_I2C_TPM_CR50 - select MAINBOARD_HAS_TPM2 - -config KAHLEE_TPM - bool - default y if BOARD_GOOGLE_KAHLEE - select MAINBOARD_HAS_LPC_TPM - select MAINBOARD_HAS_TPM1 - endif # BOARD_GOOGLE_BASEBOARD_KAHLEE |