From 4a198b578a94a2ff8998a3ebc66d8e0bc6f67a12 Mon Sep 17 00:00:00 2001
From: Zhuohao Lee <zhuohao@chromium.org>
Date: Fri, 16 Jul 2021 18:58:53 +0800
Subject: mb/google/brya: add BASEBOARD_DIR to support different baseboard

In order to support different baseboard configuration, we
add the BASEBOARD_DIR to switch the directory. The expected
structure looks like:

mb
..|_ google
.........|_ brya
.............. |_ variants
.....................|_ baseboard
..............................|_ brya
....................................|_ gpio.c
....................................|_ memory.c
....................................|_ devicetree
..............................|_ brask
....................................|_ gpio.c
....................................|_ memory.c
....................................|_ devicetree
......................|_ brya_variant1
......................|_ brya_variant2
......................|_ ...
......................|_ brask_variant1
......................|_ brask_variant2
......................|_ ...
...............|_ <all mb common code>

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

Change-Id: Ic99e42dbbd27fa3e1f6cb3a1b5daee1c8c7b1083
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56308
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
---
 src/mainboard/google/brya/Kconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/mainboard/google/brya/Kconfig')

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 80e8d72bdd..d1b6f24ca3 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -35,6 +35,10 @@ config BOARD_GOOGLE_BASEBOARD_BRYA
 
 if BOARD_GOOGLE_BASEBOARD_BRYA
 
+config BASEBOARD_DIR
+	string
+	default "brya" if BOARD_GOOGLE_BASEBOARD_BRYA
+
 config CHROMEOS
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI
 	select EC_GOOGLE_CHROMEEC_SWITCHES
@@ -42,7 +46,7 @@ config CHROMEOS
 	select VBOOT_LID_SWITCH
 
 config DEVICETREE
-	default "variants/baseboard/devicetree.cb"
+	default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb"
 
 config DRIVER_TPM_I2C_BUS
 	hex
@@ -64,7 +68,7 @@ config MAINBOARD_DIR
 
 config MAINBOARD_FAMILY
 	string
-	default "Google_Brya"
+	default "Google_Brya" if BOARD_GOOGLE_BASEBOARD_BRYA
 
 config MAINBOARD_PART_NUMBER
 	default "Brya" if BOARD_GOOGLE_BRYA0
-- 
cgit v1.2.3