mainboard/google/Kahlee: Combine BiosCallOuts files

There's no need to have these separated.

BUG=b:64932381
Test=Build & Boot

Change-Id: I22898d3bf95d5e9a8fc2643bfccae1e2f5b29e44
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/22184
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

3 files changed, 6 insertions, 28 deletions

diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c
index 49f7190a4e..bf590ec137 100644
--- a/src/mainboard/google/kahlee/BiosCallOuts.c
+++ b/src/mainboard/google/kahlee/BiosCallOuts.c
@@ -21,6 +21,11 @@
 
 extern const GPIO_CONTROL oem_kahlee_gpio[];
 
+void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)
+{
+	FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio;
+}
+
 void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)
 {
 	FchParams_env->PostOemGpioTable = (void *)oem_kahlee_gpio;
diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc
index d0a7836384..fb381bf554 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.inc
@@ -14,7 +14,7 @@
 #
 
 bootblock-y += bootblock/bootblock.c
-bootblock-y += bootblock/BiosCallOuts.c
+bootblock-y += BiosCallOuts.c
 bootblock-y += bootblock/OemCustomize.c
 bootblock-y += ec.c
 bootblock-y += gpio.c
diff --git a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c
deleted file mode 100644
index 3ca3c6f9e7..0000000000
--- a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015-2016 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <AGESA.h>
-#include <BiosCallOuts.h>
-#include <FchPlatform.h>
-#include <soc/southbridge.h>
-#include <stdlib.h>
-
-extern const GPIO_CONTROL oem_kahlee_gpio[];
-
-void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)
-{
-	FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio;
-}