Change in coreboot[master]: guybrush: Inject SPDs into APCB

[Rob Barnes (Code Review)]

Attention is currently required from: Martin Roth - Personal.
Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60775 )

Change subject: guybrush: Inject SPDs into APCB
......................................................................

guybrush: Inject SPDs into APCB

Inject SPDs into APCB at coreboot build time.

BUG=b:209486191
BRANCH=None
TEST=Boot guybrush and nipperkin with injected APCB

Change-Id: Ib21085855324e0d473dd5e258f35a52bed326901
Signed-off-by: Rob Barnes 
---
M Makefile.inc
M src/mainboard/google/guybrush/Makefile.inc
2 files changed, 8 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/60775/1

diff --git a/Makefile.inc b/Makefile.inc
index 090505e..cc7317d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -591,6 +591,8 @@

APCB_EDIT_TOOL:=$(top)/util/apcb/apcb_edit.py

+APCB_V3_EDIT_TOOL:=$(top)/util/apcb/apcb_v3_edit.py
+
 CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage

FUTILITY?=$(objutil)/futility/futility
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc
index fa729fe..256849f 100644
--- a/src/mainboard/google/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/Makefile.inc
@@ -3,14 +3,6 @@
 bootblock-y += bootblock.c
 bootblock-$(CONFIG_CHROMEOS) += chromeos.c

-ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin),)
-$(info APCB sources present.)
-APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin
-APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin
-else
-$(info APCB sources not found.  Skipping APCB.)
-endif
-
 romstage-y += port_descriptors.c
 romstage-y += romstage.c

@@ -25,8 +17,13 @@

subdirs-y += variants/baseboard
 subdirs-y += variants/$(VARIANT_DIR)
-
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include

LIB_SPD_DEPS = $(SPD_SOURCES)
+
+APCB_SOURCES = $(obj)/APCB_CZN_D4.gen
+APCB_SOURCES_RECOVERY = $(obj)/APCB_CZN_D4.gen
+
+$(obj)/APCB_CZN_D4.gen: $(SPD_SOURCES) $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin
+	$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin $(obj)/APCB_CZN_D4.gen  --spd_sources $(SPD_SOURCES)