From d540d740b6e76ece7a3fbd5d8803f652a176b50c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 23 Oct 2017 11:29:35 -0600 Subject: mainboard/google/kahlee: Prepare for variants Move files that are particularly specific to the mainboard into the variant directory. Files that only have small areas of mainboard specific pieces use #if to separate between the boards. Add memory.c to split out the variant board id into a weak function. Add baseboard/gpio.h to satisfy the build - this will be updated in the next commit. BUG=b:68293392 Change-Id: I7c1beb45f571f2547f3b5b0d7ec78923d0cec761 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/22185 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/kahlee/BiosCallOuts.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/kahlee/BiosCallOuts.c') diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c index bf590ec137..f26b54e0ed 100644 --- a/src/mainboard/google/kahlee/BiosCallOuts.c +++ b/src/mainboard/google/kahlee/BiosCallOuts.c @@ -19,17 +19,18 @@ #include #include -extern const GPIO_CONTROL oem_kahlee_gpio[]; +extern const GPIO_CONTROL agesa_board_gpios[]; void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) { - FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio; + FchParams_reset->EarlyOemGpioTable = (void *)agesa_board_gpios; } void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env) { - FchParams_env->PostOemGpioTable = (void *)oem_kahlee_gpio; + FchParams_env->PostOemGpioTable = (void *)agesa_board_gpios; /* SDHCI/MMC configuration */ - FchParams_env->Sd.SdSlotType = 1; // EMMC + if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KAHLEE)) + FchParams_env->Sd.SdSlotType = 1; // EMMC } -- cgit v1.2.3