<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Prepare for variants<br><br>BUG=b:68293392<br><br>Move files that are particularly specific to the mainboard into the<br>variant directory. Files that only have small areas of mainboard<br>specific pieces use #if to separate between the boards.<br><br>Change-Id: I7c1beb45f571f2547f3b5b0d7ec78923d0cec761<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/BiosCallOuts.c<br>M src/mainboard/google/kahlee/Kconfig<br>M src/mainboard/google/kahlee/Makefile.inc<br>M src/mainboard/google/kahlee/ec.h<br>R src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c<br>R src/mainboard/google/kahlee/variants/kahlee/acpi/usb_oc.asl<br>R src/mainboard/google/kahlee/variants/kahlee/boardid.c<br>R src/mainboard/google/kahlee/variants/kahlee/chromeos.c<br>R src/mainboard/google/kahlee/variants/kahlee/devicetree.cb<br>R src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>10 files changed, 28 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/22185/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c<br>index bf590ec..e5f7f98 100644<br>--- a/src/mainboard/google/kahlee/BiosCallOuts.c<br>+++ b/src/mainboard/google/kahlee/BiosCallOuts.c<br>@@ -31,5 +31,6 @@<br> FchParams_env->PostOemGpioTable = (void *)oem_kahlee_gpio;<br> <br> /* SDHCI/MMC configuration */<br>- FchParams_env->Sd.SdSlotType = 1; // EMMC<br>+ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KAHLEE))<br>+ FchParams_env->Sd.SdSlotType = 1; // EMMC<br> }<br>diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig<br>index 76e8ead..ddb1955 100644<br>--- a/src/mainboard/google/kahlee/Kconfig<br>+++ b/src/mainboard/google/kahlee/Kconfig<br>@@ -35,9 +35,17 @@<br> string<br> default google/kahlee<br> <br>+config VARIANT_DIR<br>+ string<br>+ default "kahlee" if BOARD_GOOGLE_KAHLEE<br>+<br> config MAINBOARD_PART_NUMBER<br> string<br>- default "Kahlee"<br>+ default "Kahlee" if BOARD_GOOGLE_KAHLEE<br>+<br>+config DEVICETREE<br>+ string<br>+ default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"<br> <br> config MAX_CPUS<br> int<br>@@ -66,7 +74,7 @@<br> config GBB_HWID<br> string<br> depends on CHROMEOS<br>- default "KAHLEE TEST 6421"<br>+ default "KAHLEE TEST 6421" if BOARD_GOOGLE_KAHLEE<br> <br> config AMD_FWM_POSITION_INDEX<br> int<br>diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc<br>index fb381bf..bbf14e0 100644<br>--- a/src/mainboard/google/kahlee/Makefile.inc<br>+++ b/src/mainboard/google/kahlee/Makefile.inc<br>@@ -13,26 +13,28 @@<br> # GNU General Public License for more details.<br> #<br> <br>+bootblock-y += ec.c<br> bootblock-y += bootblock/bootblock.c<br> bootblock-y += BiosCallOuts.c<br> bootblock-y += bootblock/OemCustomize.c<br>-bootblock-y += ec.c<br>-bootblock-y += gpio.c<br>+bootblock-y += variants/$(VARIANT_DIR)/gpio.c<br> <br> romstage-y += BiosCallOuts.c<br>-romstage-y += boardid.c<br>-romstage-y += chromeos.c<br>-romstage-y += gpio.c<br>-romstage-y += OemCustomize.c<br>+romstage-y += variants/$(VARIANT_DIR)/boardid.c<br>+romstage-y += variants/$(VARIANT_DIR)/chromeos.c<br>+romstage-y += variants/$(VARIANT_DIR)/gpio.c<br>+romstage-y += variants/$(VARIANT_DIR)/OemCustomize.c<br> <br>-ramstage-y += BiosCallOuts.c<br>-ramstage-y += boardid.c<br>-ramstage-y += chromeos.c<br> ramstage-y += ec.c<br>-ramstage-y += gpio.c<br>-ramstage-y += OemCustomize.c<br>+ramstage-y += BiosCallOuts.c<br>+ramstage-y += variants/$(VARIANT_DIR)/boardid.c<br>+ramstage-y += variants/$(VARIANT_DIR)/chromeos.c<br>+ramstage-y += variants/$(VARIANT_DIR)/gpio.c<br>+ramstage-y += variants/$(VARIANT_DIR)/OemCustomize.c<br> <br>-verstage-y += chromeos.c<br> verstage-y += ec.c<br>+verstage-y += variants/$(VARIANT_DIR)/chromeos.c<br> <br> smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c<br>+<br>+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)<br>diff --git a/src/mainboard/google/kahlee/ec.h b/src/mainboard/google/kahlee/ec.h<br>index 495ad69..c3374d8 100644<br>--- a/src/mainboard/google/kahlee/ec.h<br>+++ b/src/mainboard/google/kahlee/ec.h<br>@@ -19,10 +19,12 @@<br> #include <ec/ec.h><br> #include <ec/google/chromeec/ec_commands.h><br> <br>+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_KAHLEE)<br> /* AGPIO22 -> GPE3 */<br> #define EC_SCI_GPI 3<br> /* GPIO_S5_07 is EC_SMI#, but it is bit 23 in GPE_STS and ALT_GPIO_SMI. */<br> #define EC_SMI_GPI 23<br>+#endif<br> <br> #define MAINBOARD_EC_SCI_EVENTS \<br> (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\<br>diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/OemCustomize.c<br>rename to src/mainboard/google/kahlee/variants/kahlee/OemCustomize.c<br>diff --git a/src/mainboard/google/kahlee/acpi/usb_oc.asl b/src/mainboard/google/kahlee/variants/kahlee/acpi/usb_oc.asl<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/acpi/usb_oc.asl<br>rename to src/mainboard/google/kahlee/variants/kahlee/acpi/usb_oc.asl<br>diff --git a/src/mainboard/google/kahlee/boardid.c b/src/mainboard/google/kahlee/variants/kahlee/boardid.c<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/boardid.c<br>rename to src/mainboard/google/kahlee/variants/kahlee/boardid.c<br>diff --git a/src/mainboard/google/kahlee/chromeos.c b/src/mainboard/google/kahlee/variants/kahlee/chromeos.c<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/chromeos.c<br>rename to src/mainboard/google/kahlee/variants/kahlee/chromeos.c<br>diff --git a/src/mainboard/google/kahlee/devicetree.cb b/src/mainboard/google/kahlee/variants/kahlee/devicetree.cb<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/devicetree.cb<br>rename to src/mainboard/google/kahlee/variants/kahlee/devicetree.cb<br>diff --git a/src/mainboard/google/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/gpio.c<br>rename to src/mainboard/google/kahlee/variants/kahlee/gpio.c<br></pre><p>To view, visit <a href="https://review.coreboot.org/22185">change 22185</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22185"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7c1beb45f571f2547f3b5b0d7ec78923d0cec761 </div>
<div style="display:none"> Gerrit-Change-Number: 22185 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>