summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorZhuohao Lee <zhuohao@chromium.org>2021-07-16 18:19:35 +0800
committerWerner Zeh <werner.zeh@siemens.com>2021-07-26 04:58:20 +0000
commit3b28ab098ec1e7f1ffadb335f110b584a82e83f5 (patch)
treef4430a7ccc0b80d350fdad0391f014caac5b4d8f /src/mainboard
parent22618d9f07a16f47db37b7db4a096a93d1818034 (diff)
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>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/brya/Kconfig7
-rw-r--r--src/mainboard/google/brya/Kconfig.name4
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