mb/google/brya: move the common config to the baseboard

This patch moves the common config to the Kconfig under
BOARD_GOOGLE_BASEBOARD_BRYA and removes the redundant config.

BUG=b:191472401
BRANCH=None
TEST=build pass

Change-Id: Ie59299dfaba6bb23758d4a4c22a6dbbb4ba6520e
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56387
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Zhuohao Lee 2021-07-16 18:19:35 +08:00 committed by Werner Zeh
parent 22618d9f07
commit 3b28ab098e
2 changed files with 2 additions and 9 deletions

View File

@ -31,13 +31,10 @@ config BOARD_GOOGLE_BASEBOARD_BRYA
select SOC_INTEL_ALDERLAKE select SOC_INTEL_ALDERLAKE
select SOC_INTEL_COMMON_BLOCK_PCIE_RTD3 select SOC_INTEL_COMMON_BLOCK_PCIE_RTD3
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select SYSTEM_TYPE_LAPTOP
if BOARD_GOOGLE_BASEBOARD_BRYA if BOARD_GOOGLE_BASEBOARD_BRYA
config BASEBOARD_BRYA_LAPTOP
def_bool n
select SYSTEM_TYPE_LAPTOP
config CHROMEOS config CHROMEOS
select CHROMEOS_DRAM_PART_NUMBER_IN_CBI select CHROMEOS_DRAM_PART_NUMBER_IN_CBI
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
@ -70,7 +67,7 @@ config MAINBOARD_DIR
config MAINBOARD_FAMILY config MAINBOARD_FAMILY
string string
default "Google_Brya0" if BOARD_GOOGLE_BRYA0 default "Google_Brya"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string

View File

@ -1,8 +1,6 @@
config BOARD_GOOGLE_BRYA0 config BOARD_GOOGLE_BRYA0
bool "Brya 0" bool "Brya 0"
select BOARD_GOOGLE_BASEBOARD_BRYA select BOARD_GOOGLE_BASEBOARD_BRYA
select BASEBOARD_BRYA_LAPTOP
select BOARD_ROMSIZE_KB_32768
select ADL_ENABLE_USB4_PCIE_RESOURCES select ADL_ENABLE_USB4_PCIE_RESOURCES
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
select DRIVERS_INTEL_MIPI_CAMERA select DRIVERS_INTEL_MIPI_CAMERA
@ -12,12 +10,10 @@ config BOARD_GOOGLE_BRYA0
config BOARD_GOOGLE_PRIMUS config BOARD_GOOGLE_PRIMUS
bool "-> Primus" bool "-> Primus"
select BOARD_GOOGLE_BASEBOARD_BRYA select BOARD_GOOGLE_BASEBOARD_BRYA
select BASEBOARD_BRYA_LAPTOP
config BOARD_GOOGLE_GIMBLE config BOARD_GOOGLE_GIMBLE
bool "-> Gimble" bool "-> Gimble"
select BOARD_GOOGLE_BASEBOARD_BRYA select BOARD_GOOGLE_BASEBOARD_BRYA
select BASEBOARD_BRYA_LAPTOP
select CHROMEOS_DSM_CALIB if CHROMEOS select CHROMEOS_DSM_CALIB if CHROMEOS
select DRIVERS_I2C_MAX98390 select DRIVERS_I2C_MAX98390