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: [PATCH] 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 ++++++--
 src/mainboard/google/brya/Makefile.inc                    | 5 +++--
 .../brya/variants/baseboard/{ => brya}/Makefile.inc       | 0
 .../brya/variants/baseboard/{ => brya}/devicetree.cb      | 0
 .../google/brya/variants/baseboard/{ => brya}/gpio.c      | 0
 .../variants/baseboard/{ => brya}/include/baseboard/ec.h  | 0
 .../baseboard/{ => brya}/include/baseboard/gpio.h         | 0
 .../baseboard/{ => brya}/include/baseboard/variants.h     | 0
 .../google/brya/variants/baseboard/{ => brya}/memory.c    | 0
 9 files changed, 9 insertions(+), 4 deletions(-)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/Makefile.inc (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/devicetree.cb (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/gpio.c (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/include/baseboard/ec.h (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/include/baseboard/gpio.h (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/include/baseboard/variants.h (100%)
 rename src/mainboard/google/brya/variants/baseboard/{ => brya}/memory.c (100%)

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
diff --git a/src/mainboard/google/brya/Makefile.inc b/src/mainboard/google/brya/Makefile.inc
index 0686a3018b..717cf5fe40 100644
--- a/src/mainboard/google/brya/Makefile.inc
+++ b/src/mainboard/google/brya/Makefile.inc
@@ -10,11 +10,12 @@ ramstage-y += mainboard.c
 ramstage-y += ec.c
 
 VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
+BASEBOARD_DIR:=$(call strip_quotes,$(CONFIG_BASEBOARD_DIR))
 
-subdirs-y += variants/baseboard
+subdirs-y += variants/baseboard/$(BASEBOARD_DIR)
 subdirs-y += variants/$(VARIANT_DIR)
 subdirs-y += variants/$(VARIANT_DIR)/memory
 subdirs-y += spd
 
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/$(BASEBOARD_DIR)/include
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/google/brya/variants/baseboard/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/Makefile.inc
rename to src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/baseboard/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/devicetree.cb
rename to src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
diff --git a/src/mainboard/google/brya/variants/baseboard/gpio.c b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/gpio.c
rename to src/mainboard/google/brya/variants/baseboard/brya/gpio.c
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h
rename to src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/gpio.h
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h
rename to src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/gpio.h
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/variants.h
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
rename to src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/variants.h
diff --git a/src/mainboard/google/brya/variants/baseboard/memory.c b/src/mainboard/google/brya/variants/baseboard/brya/memory.c
similarity index 100%
rename from src/mainboard/google/brya/variants/baseboard/memory.c
rename to src/mainboard/google/brya/variants/baseboard/brya/memory.c