From 97535558f1a1c123a60d73244d835ff5d8d31213 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 17 Feb 2017 20:25:46 -0800 Subject: mainboard/{google,intel}: Change config option selection Change config option selection from "config xyz default y" to "select xyz" if the config option has no dependencies. BUG=None BRANCH=None TEST=Verified that config option selection remains unchanged. Change-Id: I259ae40623b7f4d5589e2caa0988419ba4fefda4 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/18400 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie --- src/mainboard/google/chell/Kconfig | 8 ++------ src/mainboard/google/eve/Kconfig | 16 ++++----------- src/mainboard/google/glados/Kconfig | 8 ++------ src/mainboard/google/lars/Kconfig | 12 +++--------- src/mainboard/google/poppy/Kconfig | 8 ++------ src/mainboard/google/reef/Kconfig | 24 ++++++----------------- src/mainboard/intel/camelbackmountain_fsp/Kconfig | 5 +---- src/mainboard/intel/kunimitsu/Kconfig | 12 +++--------- 8 files changed, 23 insertions(+), 70 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig index 807285def7..9b88a8573d 100644 --- a/src/mainboard/google/chell/Kconfig +++ b/src/mainboard/google/chell/Kconfig @@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC @@ -22,12 +24,6 @@ config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select LID_SWITCH -config DRIVERS_I2C_GENERIC - def_bool y - -config DRIVERS_I2C_NAU8825 - def_bool y - config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index 731b03510e..2b66eb1d17 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -4,6 +4,10 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_HID + select DRIVERS_I2C_WACOM + select DRIVERS_PS2_KEYBOARD select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC @@ -23,18 +27,6 @@ config CHROMEOS select LID_SWITCH select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN -config DRIVERS_I2C_GENERIC - def_bool y - -config DRIVERS_I2C_HID - def_bool y - -config DRIVERS_I2C_WACOM - def_bool y - -config DRIVERS_PS2_KEYBOARD - default y - config DRIVER_TPM_I2C_BUS hex default 0x1 diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 2473ec0646..09082945de 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC @@ -22,12 +24,6 @@ config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select LID_SWITCH -config DRIVERS_I2C_GENERIC - def_bool y - -config DRIVERS_I2C_NAU8825 - def_bool y - config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig index 30abfa9682..73d502c313 100644 --- a/src/mainboard/google/lars/Kconfig +++ b/src/mainboard/google/lars/Kconfig @@ -4,6 +4,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC @@ -23,15 +26,6 @@ config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select LID_SWITCH -config DRIVERS_GENERIC_MAX98357A - default y - -config DRIVERS_I2C_GENERIC - default y - -config DRIVERS_I2C_NAU8825 - default y - config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index d986e3cc34..dc1be0afdd 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_WACOM select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME @@ -18,12 +20,6 @@ config CHROMEOS select LID_SWITCH select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC -config DRIVERS_I2C_GENERIC - def_bool y - -config DRIVERS_I2C_WACOM - def_bool y - config GBB_HWID string depends on CHROMEOS diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 077cb7c5bc..8612747a12 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -3,6 +3,12 @@ config BOARD_GOOGLE_BASEBOARD_REEF def_bool n select SOC_INTEL_APOLLOLAKE select BOARD_ROMSIZE_KB_16384 + select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_DA7219 + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_HID + select DRIVERS_I2C_WACOM + select DRIVERS_PS2_KEYBOARD select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME @@ -38,21 +44,6 @@ config CHROMEOS select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN select LID_SWITCH if BASEBOARD_REEF_LAPTOP -config DRIVERS_I2C_DA7219 - default y - -config DRIVERS_I2C_GENERIC - default y - -config DRIVERS_I2C_HID - default y - -config DRIVERS_I2C_WACOM - default y - -config DRIVERS_PS2_KEYBOARD - default y - config MAINBOARD_DIR string default google/reef @@ -103,7 +94,4 @@ config INCLUDE_NHLT_BLOBS select NHLT_DA7219 select NHLT_MAX98357 -config DRIVERS_GENERIC_MAX98357A - default y - endif # BOARD_GOOGLE_REEF diff --git a/src/mainboard/intel/camelbackmountain_fsp/Kconfig b/src/mainboard/intel/camelbackmountain_fsp/Kconfig index abdd970311..9e71a088f2 100644 --- a/src/mainboard/intel/camelbackmountain_fsp/Kconfig +++ b/src/mainboard/intel/camelbackmountain_fsp/Kconfig @@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS select INTEGRATED_UART if FSP_PACKAGE_DEFAULT select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT select SERIRQ_CONTINUOUS_MODE + select CONSOLE_POST config MAINBOARD_DIR string @@ -35,10 +36,6 @@ config VIRTUAL_ROM_SIZE hex default 0x1000000 -config CONSOLE_POST - bool - default y - config DRIVERS_UART_8250IO def_bool n diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 4433ee8579..64a360f9f5 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -4,6 +4,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 + select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC @@ -35,15 +38,6 @@ config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select LID_SWITCH -config DRIVERS_GENERIC_MAX98357A - default y - -config DRIVERS_I2C_GENERIC - default y - -config DRIVERS_I2C_NAU8825 - default y - config IRQ_SLOT_COUNT int default 18 -- cgit v1.2.3