From dd4fa8e6038a1481622ee39f02d6cf1a1228ea72 Mon Sep 17 00:00:00 2001
From: Martin Roth <gaumless@gmail.com>
Date: Thu, 11 May 2023 15:00:40 -0600
Subject: [PATCH] Myst: Update Makefile to remove SPD injection

The SPD format in the APCB has changed for Phoenix, and the injection
tool 'apcbtool' needs to be updated to match. Until this happens, the
APCB will be built containing the correct SPD.

BUG=b:281983434
TEST=Build

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: If575f98511c796e93c5a12cd450a3a7985e39806
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75143
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jon Murphy <jpmurphy@google.com>
---
 src/mainboard/google/myst/Makefile.inc | 35 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.inc
index 136966e550..54d4f30d57 100644
--- a/src/mainboard/google/myst/Makefile.inc
+++ b/src/mainboard/google/myst/Makefile.inc
@@ -20,23 +20,30 @@ APCB_NAME=APCB_PHX_D5
 ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),)
 $(info APCB sources present.)
 
-ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
 
-LIB_SPD_DEPS = $(SPD_SOURCES)
+# The SPD is currently built directly into the APCB.
+# Add the below section back in after the apcbtool is updated to handle the
+# Phoenix APCB SPD configuration.
 
-APCB_SOURCES = $(obj)/$(APCB_NAME).gen
+#ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
+#
+#LIB_SPD_DEPS = $(SPD_SOURCES)
+#
+#APCB_SOURCES = $(obj)/$(APCB_NAME).gen
+#
+#$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
+#			$(APCB_V3_EDIT_TOOL) \
+#			$(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
+#	$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
+#			     $(obj)/$(APCB_NAME).gen  \
+#			     --spd_sources $(SPD_SOURCES) \
+#			     --mem_type 'lp5'
+#else
+#$(info SPD sources not found.  Skipping APCB.)
+#files_added:: die_no_apcb
+#endif
 
-$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
-			$(APCB_V3_EDIT_TOOL) \
-			$(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
-	$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
-			     $(obj)/$(APCB_NAME).gen  \
-			     --spd_sources $(SPD_SOURCES) \
-			     --mem_type 'lp5'
-else
-$(info SPD sources not found.  Skipping APCB.)
-files_added:: die_no_apcb
-endif
 else
 $(info APCB sources not found.  Skipping APCB.)
 files_added:: warn_no_apcb