commit 3d242755ef12815e358e6662495c371d2c2ba3bc
author Martin Roth <martin.roth@amd.corp-partner.google.com> Fri Sep 09 12:17:10 2022 -0600
committer Felix Held <felix-coreboot@felixheld.de> Thu Oct 20 17:19:51 2022 +0000
tree 22af6030ab47a2dad3aebed07e0f50dc19aabc29
parent 6a342360da6f8523fbbbb938cd11327d81d70ebe

mb/google/(guybrush|skyrim): Use a variable for APCB filename

We use the name of the APCB file repeatedly, so put it into a variable
so that it's easier to update.

Signed-off-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Change-Id: I8684db2f7b2d68f0354e37bd8cdfc4f9cab44b8a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67501
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Jason Glenesk <jason.glenesk@amd.corp-partner.google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

src/mainboard/google/guybrush/Makefile.inc

diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc
index 1158dcf..8ffb00f 100644
--- a/src/mainboard/google/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/Makefile.inc
@@ -22,14 +22,16 @@
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
 
+APCB_NAME=APCB_CZN_D4
+
 LIB_SPD_DEPS = $(SPD_SOURCES)
 
-APCB_SOURCES = $(obj)/APCB_CZN_D4.gen
-APCB_SOURCES_RECOVERY = $(obj)/APCB_CZN_D4.gen
+APCB_SOURCES = $(obj)/$(APCB_NAME).gen
+APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen
 
-$(obj)/APCB_CZN_D4.gen: $(SPD_SOURCES) \
+$(obj)/$(APCB_NAME).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  \
+			$(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
+	$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
+			     $(obj)/$(APCB_NAME).gen  \
 			     --spd_sources $(SPD_SOURCES)

src/mainboard/google/skyrim/Makefile.inc

diff --git a/src/mainboard/google/skyrim/Makefile.inc b/src/mainboard/google/skyrim/Makefile.inc
index a594ceb..0fa733e 100644
--- a/src/mainboard/google/skyrim/Makefile.inc
+++ b/src/mainboard/google/skyrim/Makefile.inc
@@ -18,21 +18,23 @@
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
 
-ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin),)
+APCB_NAME=APCB_MDN_D5
+
+ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),)
 $(info APCB sources present.)
 
 ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
 
 LIB_SPD_DEPS = $(SPD_SOURCES)
 
-APCB_SOURCES = $(obj)/APCB_MDN_D5.gen
-APCB_SOURCES_RECOVERY = $(obj)/APCB_MDN_D5.gen
+APCB_SOURCES = $(obj)/$(APCB_NAME).gen
+APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen
 
-$(obj)/APCB_MDN_D5.gen: $(SPD_SOURCES) \
+$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
 			$(APCB_V3_EDIT_TOOL) \
-			$(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin
-	$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin \
-			     $(obj)/APCB_MDN_D5.gen  \
+			$(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