From 5926ae24a6fa4ebf83f24281c3df88b61076b838 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 4 Mar 2019 15:14:29 +0100
Subject: drivers/intel/fsp1_0: Deduplicate code

Move ChipsetFspReturnPoint() to drivers/intel/fsp1_0.

Allows to have a common entry after FSP-M.

Change-Id: I064ae67041c521ee92877cff30c814fce7b08e1f
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31713
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: David Guckian
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>
---
 src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c     | 12 ------------
 src/soc/intel/fsp_baytrail/include/soc/romstage.h     |  1 -
 src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c | 13 -------------
 src/soc/intel/fsp_broadwell_de/include/soc/romstage.h |  2 --
 4 files changed, 28 deletions(-)

(limited to 'src/soc/intel')

diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index c9cbcfe960..7e90142250 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -336,16 +336,4 @@ void chipset_fsp_early_init(FSP_INIT_PARAMS *pFspInitParams,
 	return;
 }
 
-/* The FSP returns here after the fsp_early_init call */
-void ChipsetFspReturnPoint(EFI_STATUS Status,
-		VOID *HobListPtr)
-{
-	*(void **)CBMEM_FSP_HOB_PTR=HobListPtr;
-
-	if (Status == 0xFFFFFFFF) {
-		system_reset();
-	}
-	romstage_main_continue(Status, HobListPtr);
-}
-
 #endif	/* __PRE_RAM__ */
diff --git a/src/soc/intel/fsp_baytrail/include/soc/romstage.h b/src/soc/intel/fsp_baytrail/include/soc/romstage.h
index 9cbc95c240..5f0bd8d9c3 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/romstage.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/romstage.h
@@ -27,7 +27,6 @@ void report_platform_info(void);
 #include <drivers/intel/fsp1_0/fsp_util.h>
 
 void main(FSP_INFO_HEADER *fsp_info_header);
-void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr);
 uint32_t chipset_prev_sleep_state(uint32_t clear);
 
 #define NUM_ROMSTAGE_TS 4
diff --git a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c
index 54e796d48d..fd8ca38ab6 100644
--- a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c
@@ -20,7 +20,6 @@
 #include <bootstate.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <cf9_reset.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <drivers/intel/fsp1_0/fsp_util.h>
@@ -140,15 +139,3 @@ void chipset_fsp_early_init(FSP_INIT_PARAMS *pFspInitParams, FSP_INFO_HEADER *fs
 
 	return;
 }
-
-/* The FSP returns here after the fsp_early_init call */
-void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr)
-{
-	*(void **)CBMEM_FSP_HOB_PTR = HobListPtr;
-
-	if (Status == 0xFFFFFFFF) {
-		system_reset();
-	}
-
-	romstage_main_continue(Status, HobListPtr);
-}
diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/romstage.h b/src/soc/intel/fsp_broadwell_de/include/soc/romstage.h
index 877b0a0b70..63b7fbaff9 100644
--- a/src/soc/intel/fsp_broadwell_de/include/soc/romstage.h
+++ b/src/soc/intel/fsp_broadwell_de/include/soc/romstage.h
@@ -24,8 +24,6 @@
 #include <stdint.h>
 #include <fsp.h>
 
-void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr);
-
 #define NUM_ROMSTAGE_TS 4
 
 void early_mainboard_romstage_entry(void);
-- 
cgit v1.2.3