From 65f81a7b9024290b9b92bda6d1d67ab805fa3986 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 20 Jan 2021 22:48:50 +0100 Subject: broadwell: Flatten `mainboard_pre_raminit` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All Broadwell boards only use the `mainboard_pre_raminit` function to call `mainboard_fill_pei_data` and optionally `mainboard_fill_spd_data`. Move the declaration and weak definition of `mainboard_fill_spd_data` to platform code, replace the call to `mainboard_pre_raminit` in romstage.c with calls to `mainboard_fill_pei_data` and `mainboard_fill_spd_data`, and delete all other instances of `mainboard_pre_raminit` for Broadwell. Finally, delete now-empty romstage.c and spd.h files from mainboards. Change-Id: I3334b20bd7138bb753b996a137ff106e87c6e8a5 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/49776 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/mainboard/google/auron/romstage.c | 16 ---------------- src/mainboard/google/auron/variant.h | 1 - 2 files changed, 17 deletions(-) delete mode 100644 src/mainboard/google/auron/romstage.c (limited to 'src/mainboard/google/auron') diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c deleted file mode 100644 index a3705bc1b8..0000000000 --- a/src/mainboard/google/auron/romstage.c +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include "variant.h" - -void mainboard_pre_raminit(struct romstage_params *rp) -{ - /* Fill out PEI DATA */ - mainboard_fill_pei_data(&rp->pei_data); - mainboard_fill_spd_data(&rp->pei_data); - -} diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h index 380a373f2d..ba4c58a9e1 100644 --- a/src/mainboard/google/auron/variant.h +++ b/src/mainboard/google/auron/variant.h @@ -11,7 +11,6 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current); void lan_init(void); -void mainboard_fill_spd_data(struct pei_data *pei_data); void fill_spd_for_index(uint8_t spd[], unsigned int index); #define SPD_LEN 256 -- cgit v1.2.3