From 3b28ab098ec1e7f1ffadb335f110b584a82e83f5 Mon Sep 17 00:00:00 2001 From: Zhuohao Lee Date: Fri, 16 Jul 2021 18:19:35 +0800 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56387 Reviewed-by: Tim Wawrzynczak Reviewed-by: Furquan Shaikh Reviewed-by: EricR Lai Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/Kconfig | 7 ++----- src/mainboard/google/brya/Kconfig.name | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 49a8870f62..ec833f573a 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -31,13 +31,10 @@ config BOARD_GOOGLE_BASEBOARD_BRYA select SOC_INTEL_ALDERLAKE select SOC_INTEL_COMMON_BLOCK_PCIE_RTD3 select SOC_INTEL_CSE_LITE_SKU + select SYSTEM_TYPE_LAPTOP if BOARD_GOOGLE_BASEBOARD_BRYA -config BASEBOARD_BRYA_LAPTOP - def_bool n - select SYSTEM_TYPE_LAPTOP - config CHROMEOS select CHROMEOS_DRAM_PART_NUMBER_IN_CBI select EC_GOOGLE_CHROMEEC_SWITCHES @@ -70,7 +67,7 @@ config MAINBOARD_DIR config MAINBOARD_FAMILY string - default "Google_Brya0" if BOARD_GOOGLE_BRYA0 + default "Google_Brya" config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index b3b803251c..03a14e42ec 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -1,8 +1,6 @@ config BOARD_GOOGLE_BRYA0 bool "Brya 0" select BOARD_GOOGLE_BASEBOARD_BRYA - select BASEBOARD_BRYA_LAPTOP - select BOARD_ROMSIZE_KB_32768 select ADL_ENABLE_USB4_PCIE_RESOURCES select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_INTEL_MIPI_CAMERA @@ -12,12 +10,10 @@ config BOARD_GOOGLE_BRYA0 config BOARD_GOOGLE_PRIMUS bool "-> Primus" select BOARD_GOOGLE_BASEBOARD_BRYA - select BASEBOARD_BRYA_LAPTOP config BOARD_GOOGLE_GIMBLE bool "-> Gimble" select BOARD_GOOGLE_BASEBOARD_BRYA - select BASEBOARD_BRYA_LAPTOP select CHROMEOS_DSM_CALIB if CHROMEOS select DRIVERS_I2C_MAX98390