Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Maxim Polyakov: Looks good to me, approved
soc/intel/xeon_sp: make CPX ramstage.h common for CPX, SKX

CB:41106 revealed that mb/intel/cedarisland already sets FSP-S UPD (see
CB:40735) while the required includes are still missing in CPX. Buildbot
did not fail because `ramstage.c` never was (implicitly) included.

Fix this problem by making SKX/CPX share a common ramstage header for
now by moving the one from SKX.

Test: Build cedarisland_crb

Change-Id: I9cd25edd167ec71ee98c7ffa4fa6f95ca73a75e9
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41116
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com>
---
D src/soc/intel/xeon_sp/cpx/include/soc/ramstage.h
R src/soc/intel/xeon_sp/include/soc/ramstage.h
2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/ramstage.h b/src/soc/intel/xeon_sp/cpx/include/soc/ramstage.h
deleted file mode 100644
index 28e8d1a..0000000
--- a/src/soc/intel/xeon_sp/cpx/include/soc/ramstage.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* This file is part of the coreboot project. */
-
-#include <device/device.h>
-
-extern struct pci_operations soc_pci_ops;
diff --git a/src/soc/intel/xeon_sp/skx/include/soc/ramstage.h b/src/soc/intel/xeon_sp/include/soc/ramstage.h
similarity index 100%
rename from src/soc/intel/xeon_sp/skx/include/soc/ramstage.h
rename to src/soc/intel/xeon_sp/include/soc/ramstage.h

To view, visit change 41116. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9cd25edd167ec71ee98c7ffa4fa6f95ca73a75e9
Gerrit-Change-Number: 41116
Gerrit-PatchSet: 6
Gerrit-Owner: Michael Niewöhner
Gerrit-Reviewer: Andrey Petrov <andrey.petrov@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Johnny Lin
Gerrit-Reviewer: Jonathan Zhang <jonzhang@fb.com>
Gerrit-Reviewer: Maxim Polyakov <max.senia.poliak@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged