soc/intel: skl,cnl,icl: consolidate ebda and memmap

As of CB:36136 ebda and memmap are identical for skl, cnl and icl, thus
move them to common code.

Tested successfully on X11SSM-F

Change-Id: I9a20c814d2a6874fcb4ff99ef1a7825d891f74e2
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36137
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 3 insertions, 23 deletions

diff --git a/src/soc/intel/common/block/ebda/ebda.c b/src/soc/intel/common/block/ebda/ebda.c
index 6b0bd6752b..072023cd16 100644
--- a/src/soc/intel/common/block/ebda/ebda.c
+++ b/src/soc/intel/common/block/ebda/ebda.c
@@ -17,34 +17,14 @@
 #include <intelblocks/ebda.h>
 #include <string.h>
 
-/*
- * Mainboard Override function
- *
- * Mainboard directory may implement below functionality for romstage.
- */
-
-/* Fill up EBDA structure inside Mainboard directory */
-__weak void create_mainboard_ebda(struct ebda_config *cfg)
-{
-	/* no-op */
-}
-
-static void create_soc_ebda(struct ebda_config *cfg)
-{
-	/* Create EBDA header */
-	cfg->signature = EBDA_SIGNATURE;
-	/* Fill up memory layout information */
-	fill_soc_memmap_ebda(cfg);
-}
-
-void fill_ebda_area(void)
+void initialize_ebda_area(void)
 {
 	struct ebda_config ebda_cfg;
 
 	/* Initialize EBDA area early during romstage. */
 	setup_default_ebda();
-	create_soc_ebda(&ebda_cfg);
-	create_mainboard_ebda(&ebda_cfg);
+	ebda_cfg.signature = EBDA_SIGNATURE;
+	fill_memmap_ebda(&ebda_cfg);
 	write_ebda_data(&ebda_cfg, sizeof(ebda_cfg));
 }