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 <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/18400
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
This commit is contained in:
Furquan Shaikh 2017-02-17 20:25:46 -08:00 committed by Martin Roth
parent abd5d1d35c
commit 97535558f1
8 changed files with 23 additions and 70 deletions

View File

@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_NAU8825
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
@ -22,12 +24,6 @@ config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select LID_SWITCH select LID_SWITCH
config DRIVERS_I2C_GENERIC
def_bool y
config DRIVERS_I2C_NAU8825
def_bool y
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 18 default 18

View File

@ -4,6 +4,10 @@ config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 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 DRIVERS_SPI_ACPI
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
@ -23,18 +27,6 @@ config CHROMEOS
select LID_SWITCH select LID_SWITCH
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN 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 config DRIVER_TPM_I2C_BUS
hex hex
default 0x1 default 0x1

View File

@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_NAU8825
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
@ -22,12 +24,6 @@ config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select LID_SWITCH select LID_SWITCH
config DRIVERS_I2C_GENERIC
def_bool y
config DRIVERS_I2C_NAU8825
def_bool y
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 18 default 18

View File

@ -4,6 +4,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 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
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
@ -23,15 +26,6 @@ config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select LID_SWITCH 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 config IRQ_SLOT_COUNT
int int
default 18 default 18

View File

@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_WACOM
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
@ -18,12 +20,6 @@ config CHROMEOS
select LID_SWITCH select LID_SWITCH
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
config DRIVERS_I2C_GENERIC
def_bool y
config DRIVERS_I2C_WACOM
def_bool y
config GBB_HWID config GBB_HWID
string string
depends on CHROMEOS depends on CHROMEOS

View File

@ -3,6 +3,12 @@ config BOARD_GOOGLE_BASEBOARD_REEF
def_bool n def_bool n
select SOC_INTEL_APOLLOLAKE select SOC_INTEL_APOLLOLAKE
select BOARD_ROMSIZE_KB_16384 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
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
@ -38,21 +44,6 @@ config CHROMEOS
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
select LID_SWITCH if BASEBOARD_REEF_LAPTOP 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 config MAINBOARD_DIR
string string
default google/reef default google/reef
@ -103,7 +94,4 @@ config INCLUDE_NHLT_BLOBS
select NHLT_DA7219 select NHLT_DA7219
select NHLT_MAX98357 select NHLT_MAX98357
config DRIVERS_GENERIC_MAX98357A
default y
endif # BOARD_GOOGLE_REEF endif # BOARD_GOOGLE_REEF

View File

@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
select INTEGRATED_UART if FSP_PACKAGE_DEFAULT select INTEGRATED_UART if FSP_PACKAGE_DEFAULT
select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select CONSOLE_POST
config MAINBOARD_DIR config MAINBOARD_DIR
string string
@ -35,10 +36,6 @@ config VIRTUAL_ROM_SIZE
hex hex
default 0x1000000 default 0x1000000
config CONSOLE_POST
bool
default y
config DRIVERS_UART_8250IO config DRIVERS_UART_8250IO
def_bool n def_bool n

View File

@ -4,6 +4,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ID_AUTO select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384 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
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
@ -35,15 +38,6 @@ config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select LID_SWITCH 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 config IRQ_SLOT_COUNT
int int
default 18 default 18