Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/67501 )
Change subject: mb/google/(guybrush|skyrim): Use a variable for APCB filename ......................................................................
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 --- M src/mainboard/google/guybrush/Makefile.inc M src/mainboard/google/skyrim/Makefile.inc 2 files changed, 35 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Felix Held: Looks good to me, but someone else must approve Jason Glenesk: Looks good to me, approved
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc index 1158dcfa..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) 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